oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

lib/krb5: destroy a memory ccache on reinit

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12369

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

(Bases on Samba commit 2abc3710a8a63327a769ba0482c553ed274b2113)
This commit is contained in:
Stefan Metzmacher
2016-10-10 15:53:26 +02:00
committed by Jeffrey Altman
parent 6c0306843d
commit 0ff40e2f4c
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/krb5/mcache.c
View File

@@ -159,6 +159,32 @@ mcc_gen_new(krb5_context context, krb5_ccache *id)
return 0; return 0;
} }
static void KRB5_CALLCONV
mcc_destroy_internal(krb5_context context,
krb5_mcache *m)
{
struct link *l;
if (m->primary_principal != NULL) {
krb5_free_principal (context, m->primary_principal);
m->primary_principal = NULL;
}
m->dead = 1;
l = m->creds;
while (l != NULL) {
struct link *old;
krb5_free_cred_contents (context, &l->cred);
old = l;
l = l->next;
free (old);
}
m->creds = NULL;
return;
}
static krb5_error_code KRB5_CALLCONV static krb5_error_code KRB5_CALLCONV
mcc_initialize(krb5_context context, mcc_initialize(krb5_context context,
krb5_ccache id, krb5_ccache id,
@@ -168,7 +194,15 @@ mcc_initialize(krb5_context context,
krb5_error_code ret = 0; krb5_error_code ret = 0;
HEIMDAL_MUTEX_lock(&(m->mutex)); HEIMDAL_MUTEX_lock(&(m->mutex));
heim_assert(m->refcnt != 0, "resurection released mcache"); heim_assert(m->refcnt != 0, "resurection released mcache");
/*
* It's important to destroy any existing
* creds here, that matches the baheviour
* of all other backends and also the
* MEMORY: backend in MIT.
*/
mcc_destroy_internal(context, m);
m->dead = 0; m->dead = 0;
m->kdc_offset = 0;
m->mtime = time(NULL); m->mtime = time(NULL);
ret = krb5_copy_principal (context, ret = krb5_copy_principal (context,
primary_principal, primary_principal,
@@ -213,7 +247,6 @@ mcc_destroy(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
krb5_mcache **n, *m = MCACHE(id); krb5_mcache **n, *m = MCACHE(id);
struct link *l;
HEIMDAL_MUTEX_lock(&(m->mutex)); HEIMDAL_MUTEX_lock(&(m->mutex));
if (m->refcnt == 0) if (m->refcnt == 0)
@@ -233,22 +266,7 @@ mcc_destroy(krb5_context context,
} }
} }
HEIMDAL_MUTEX_unlock(&mcc_mutex); HEIMDAL_MUTEX_unlock(&mcc_mutex);
if (m->primary_principal != NULL) { mcc_destroy_internal(context, m);
krb5_free_principal (context, m->primary_principal);
m->primary_principal = NULL;
}
m->dead = 1;
l = m->creds;
while (l != NULL) {
struct link *old;
krb5_free_cred_contents (context, &l->cred);
old = l;
l = l->next;
free (old);
}
m->creds = NULL;
} }
HEIMDAL_MUTEX_unlock(&(m->mutex)); HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;