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

more mutex locking from Jaudeep Padhye

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2012-04-05 23:10:33 -07:00
parent fbf44ea51d
commit c04aa9e082
1 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
lib/krb5/mcache.c
View File

@@ -47,6 +47,7 @@ typedef struct krb5_mcache {
struct krb5_mcache *next; struct krb5_mcache *next;
time_t mtime; time_t mtime;
krb5_deltat kdc_offset; krb5_deltat kdc_offset;
pthread_mutex_t mutex;
} krb5_mcache; } krb5_mcache;
static HEIMDAL_MUTEX mcc_mutex = HEIMDAL_MUTEX_INITIALIZER; static HEIMDAL_MUTEX mcc_mutex = HEIMDAL_MUTEX_INITIALIZER;
@@ -99,6 +100,7 @@ mcc_alloc(const char *name)
m->mtime = time(NULL); m->mtime = time(NULL);
m->kdc_offset = 0; m->kdc_offset = 0;
m->next = mcc_head; m->next = mcc_head;
HEIMDAL_MUTEX_init(&(m->mutex));
mcc_head = m; mcc_head = m;
HEIMDAL_MUTEX_unlock(&mcc_mutex); HEIMDAL_MUTEX_unlock(&mcc_mutex);
return m; return m;
@@ -116,7 +118,9 @@ mcc_resolve(krb5_context context, krb5_ccache *id, const char *res)
HEIMDAL_MUTEX_unlock(&mcc_mutex); HEIMDAL_MUTEX_unlock(&mcc_mutex);
if (m != NULL) { if (m != NULL) {
HEIMDAL_MUTEX_lock(&(m->mutex));
m->refcnt++; m->refcnt++;
HEIMDAL_MUTEX_unlock(&(m->mutex));
(*id)->data.data = m; (*id)->data.data = m;
(*id)->data.length = sizeof(*m); (*id)->data.length = sizeof(*m);
return 0; return 0;
@@ -161,24 +165,33 @@ mcc_initialize(krb5_context context,
krb5_principal primary_principal) krb5_principal primary_principal)
{ {
krb5_mcache *m = MCACHE(id); krb5_mcache *m = MCACHE(id);
krb5_error_code ret = 0;
HEIMDAL_MUTEX_lock(&(m->mutex));
heim_assert(m->refcnt != 0, "resurection released mcache"); heim_assert(m->refcnt != 0, "resurection released mcache");
m->dead = 0; m->dead = 0;
m->mtime = time(NULL); m->mtime = time(NULL);
return krb5_copy_principal (context, ret = krb5_copy_principal (context,
primary_principal, primary_principal,
&m->primary_principal); &m->primary_principal);
HEIMDAL_MUTEX_unlock(&(m->mutex));
return ret;
} }
static int static int
mcc_close_internal(krb5_mcache *m) mcc_close_internal(krb5_mcache *m)
{ {
if (--m->refcnt != 0) HEIMDAL_MUTEX_lock(&(m->mutex));
heim_assert(m->refcnt != 0, "closed dead cache mcache");
if (--m->refcnt != 0) {
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
}
if (MISDEAD(m)) { if (MISDEAD(m)) {
free (m->name); free (m->name);
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 1; return 1;
} }
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }
@@ -186,8 +199,12 @@ static krb5_error_code KRB5_CALLCONV
mcc_close(krb5_context context, mcc_close(krb5_context context,
krb5_ccache id) krb5_ccache id)
{ {
if (mcc_close_internal(MCACHE(id))) krb5_mcache *m = MCACHE(id);
if (mcc_close_internal(MCACHE(id))) {
HEIMDAL_MUTEX_destroy(&(m->mutex));
krb5_data_free(&id->data); krb5_data_free(&id->data);
}
return 0; return 0;
} }
@@ -198,8 +215,12 @@ mcc_destroy(krb5_context context,
krb5_mcache **n, *m = MCACHE(id); krb5_mcache **n, *m = MCACHE(id);
struct link *l; struct link *l;
HEIMDAL_MUTEX_lock(&(m->mutex));
if (m->refcnt == 0) if (m->refcnt == 0)
{
HEIMDAL_MUTEX_unlock(&(m->mutex));
krb5_abortx(context, "mcc_destroy: refcnt already 0"); krb5_abortx(context, "mcc_destroy: refcnt already 0");
}
if (!MISDEAD(m)) { if (!MISDEAD(m)) {
/* if this is an active mcache, remove it from the linked /* if this is an active mcache, remove it from the linked
@@ -229,6 +250,7 @@ mcc_destroy(krb5_context context,
} }
m->creds = NULL; m->creds = NULL;
} }
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }
@@ -241,13 +263,18 @@ mcc_store_cred(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
struct link *l; struct link *l;
HEIMDAL_MUTEX_lock(&(m->mutex));
if (MISDEAD(m)) if (MISDEAD(m))
{
HEIMDAL_MUTEX_unlock(&(m->mutex));
return ENOENT; return ENOENT;
}
l = malloc (sizeof(*l)); l = malloc (sizeof(*l));
if (l == NULL) { if (l == NULL) {
krb5_set_error_message(context, KRB5_CC_NOMEM, krb5_set_error_message(context, KRB5_CC_NOMEM,
N_("malloc: out of memory", "")); N_("malloc: out of memory", ""));
HEIMDAL_MUTEX_unlock(&(m->mutex));
return KRB5_CC_NOMEM; return KRB5_CC_NOMEM;
} }
l->next = m->creds; l->next = m->creds;
@@ -257,9 +284,11 @@ mcc_store_cred(krb5_context context,
if (ret) { if (ret) {
m->creds = l->next; m->creds = l->next;
free (l); free (l);
HEIMDAL_MUTEX_unlock(&(m->mutex));
return ret; return ret;
} }
m->mtime = time(NULL); m->mtime = time(NULL);
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }
@@ -269,12 +298,18 @@ mcc_get_principal(krb5_context context,
krb5_principal *principal) krb5_principal *principal)
{ {
krb5_mcache *m = MCACHE(id); krb5_mcache *m = MCACHE(id);
krb5_error_code ret = 0;
if (MISDEAD(m) || m->primary_principal == NULL) HEIMDAL_MUTEX_lock(&(m->mutex));
if (MISDEAD(m) || m->primary_principal == NULL) {
HEIMDAL_MUTEX_unlock(&(m->mutex));
return ENOENT; return ENOENT;
return krb5_copy_principal (context, }
ret = krb5_copy_principal (context,
m->primary_principal, m->primary_principal,
principal); principal);
HEIMDAL_MUTEX_unlock(&(m->mutex));
return ret;
} }
static krb5_error_code KRB5_CALLCONV static krb5_error_code KRB5_CALLCONV
@@ -284,10 +319,14 @@ mcc_get_first (krb5_context context,
{ {
krb5_mcache *m = MCACHE(id); krb5_mcache *m = MCACHE(id);
if (MISDEAD(m)) HEIMDAL_MUTEX_lock(&(m->mutex));
if (MISDEAD(m)) {
HEIMDAL_MUTEX_unlock(&(m->mutex));
return ENOENT; return ENOENT;
}
*cursor = m->creds; *cursor = m->creds;
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }
@@ -300,8 +339,12 @@ mcc_get_next (krb5_context context,
krb5_mcache *m = MCACHE(id); krb5_mcache *m = MCACHE(id);
struct link *l; struct link *l;
if (MISDEAD(m)) HEIMDAL_MUTEX_lock(&(m->mutex));
if (MISDEAD(m)) {
HEIMDAL_MUTEX_unlock(&(m->mutex));
return ENOENT; return ENOENT;
}
HEIMDAL_MUTEX_unlock(&(m->mutex));
l = *cursor; l = *cursor;
if (l != NULL) { if (l != NULL) {
@@ -329,6 +372,9 @@ mcc_remove_cred(krb5_context context,
{ {
krb5_mcache *m = MCACHE(id); krb5_mcache *m = MCACHE(id);
struct link **q, *p; struct link **q, *p;
HEIMDAL_MUTEX_lock(&(m->mutex));
for(q = &m->creds, p = *q; p; p = *q) { for(q = &m->creds, p = *q; p; p = *q) {
if(krb5_compare_creds(context, which, mcreds, &p->cred)) { if(krb5_compare_creds(context, which, mcreds, &p->cred)) {
*q = p->next; *q = p->next;
@@ -338,6 +384,7 @@ mcc_remove_cred(krb5_context context,
} else } else
q = &p->next; q = &p->next;
} }
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }
@@ -359,16 +406,16 @@ mcc_get_cache_first(krb5_context context, krb5_cc_cursor *cursor)
struct mcache_iter *iter; struct mcache_iter *iter;
iter = calloc(1, sizeof(*iter)); iter = calloc(1, sizeof(*iter));
if (iter == NULL) { if (iter == NULL)
krb5_set_error_message(context, ENOMEM, return krb5_enomem(context);
N_("malloc: out of memory", ""));
return ENOMEM;
}
HEIMDAL_MUTEX_lock(&mcc_mutex); HEIMDAL_MUTEX_lock(&mcc_mutex);
iter->cache = mcc_head; iter->cache = mcc_head;
if (iter->cache) if (iter->cache) {
HEIMDAL_MUTEX_lock(&(iter->cache->mutex));
iter->cache->refcnt++; iter->cache->refcnt++;
HEIMDAL_MUTEX_unlock(&(iter->cache->mutex));
}
HEIMDAL_MUTEX_unlock(&mcc_mutex); HEIMDAL_MUTEX_unlock(&mcc_mutex);
*cursor = iter; *cursor = iter;
@@ -388,7 +435,12 @@ mcc_get_cache_next(krb5_context context, krb5_cc_cursor cursor, krb5_ccache *id)
HEIMDAL_MUTEX_lock(&mcc_mutex); HEIMDAL_MUTEX_lock(&mcc_mutex);
m = iter->cache; m = iter->cache;
if (m->next) if (m->next)
{
HEIMDAL_MUTEX_lock(&(m->next->mutex));
m->next->refcnt++; m->next->refcnt++;
HEIMDAL_MUTEX_unlock(&(m->next->mutex));
}
iter->cache = m->next; iter->cache = m->next;
HEIMDAL_MUTEX_unlock(&mcc_mutex); HEIMDAL_MUTEX_unlock(&mcc_mutex);
@@ -432,6 +484,8 @@ mcc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
} }
} }
HEIMDAL_MUTEX_lock(&(mfrom->mutex));
HEIMDAL_MUTEX_lock(&(mto->mutex));
/* swap creds */ /* swap creds */
creds = mto->creds; creds = mto->creds;
mto->creds = mfrom->creds; mto->creds = mfrom->creds;
@@ -443,6 +497,8 @@ mcc_move(krb5_context context, krb5_ccache from, krb5_ccache to)
mto->mtime = mfrom->mtime = time(NULL); mto->mtime = mfrom->mtime = time(NULL);
HEIMDAL_MUTEX_unlock(&(mfrom->mutex));
HEIMDAL_MUTEX_unlock(&(mto->mutex));
HEIMDAL_MUTEX_unlock(&mcc_mutex); HEIMDAL_MUTEX_unlock(&mcc_mutex);
mcc_destroy(context, from); mcc_destroy(context, from);
@@ -464,7 +520,10 @@ mcc_default_name(krb5_context context, char **str)
static krb5_error_code KRB5_CALLCONV static krb5_error_code KRB5_CALLCONV
mcc_lastchange(krb5_context context, krb5_ccache id, krb5_timestamp *mtime) mcc_lastchange(krb5_context context, krb5_ccache id, krb5_timestamp *mtime)
{ {
*mtime = MCACHE(id)->mtime; krb5_mcache *m = MCACHE(id);
HEIMDAL_MUTEX_lock(&(m->mutex));
*mtime = m->mtime;
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }
@@ -472,7 +531,9 @@ static krb5_error_code KRB5_CALLCONV
mcc_set_kdc_offset(krb5_context context, krb5_ccache id, krb5_deltat kdc_offset) mcc_set_kdc_offset(krb5_context context, krb5_ccache id, krb5_deltat kdc_offset)
{ {
krb5_mcache *m = MCACHE(id); krb5_mcache *m = MCACHE(id);
HEIMDAL_MUTEX_lock(&(m->mutex));
m->kdc_offset = kdc_offset; m->kdc_offset = kdc_offset;
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }
@@ -480,7 +541,9 @@ static krb5_error_code KRB5_CALLCONV
mcc_get_kdc_offset(krb5_context context, krb5_ccache id, krb5_deltat *kdc_offset) mcc_get_kdc_offset(krb5_context context, krb5_ccache id, krb5_deltat *kdc_offset)
{ {
krb5_mcache *m = MCACHE(id); krb5_mcache *m = MCACHE(id);
HEIMDAL_MUTEX_lock(&(m->mutex));
*kdc_offset = m->kdc_offset; *kdc_offset = m->kdc_offset;
HEIMDAL_MUTEX_unlock(&(m->mutex));
return 0; return 0;
} }