AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-05 01:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lock handling in memory hander of nscd.

Browse Source 
The commit 20e498bd removes the pthread_mutex_rdlock() calls, but not the
corresponding pthread_mutex_unlock() calls. Also, the database lock is never
unlocked in one branch of the mempool_alloc() if.

I think unreproducible random assert(dh->usable) crashes in prune_cache() were
caused by this. But an easy way to make nscd threads hang with the broken
locking was.
This commit is contained in:
Petr Baudis 2009-07-16 10:10:10 -07:00 committed by Ulrich Drepper
parent 50158f9552
commit 137028b4d7
8 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,13 @@
2009-07-16 Petr Baudis <pasky@suse.cz>
* nscd/mem.c (mempool_alloc): Fix unlock missing in the else branch.
* nscd/aicache.c: Remove bogus db->lock unlock.
* nscd/grpcache.c: Likewise.
* nscd/hstcache.c: Likewise.
* nscd/initgrcache.c: Likewise.
* nscd/pwdcache.c: Likewise.
* nscd/servicescache.c: Likewise.
2009-07-16 Ulrich Drepper <drepper@redhat.com> 2009-07-16 Ulrich Drepper <drepper@redhat.com>
* nscd/cache.c (cache_add): Use atomic_compare_and_exchange_bool_rel * nscd/cache.c (cache_add): Use atomic_compare_and_exchange_bool_rel
@ -5,6 +15,7 @@
is written before the list head update. is written before the list head update.
Patch by Andreas Schwab <aschwab@redhat.com>. Patch by Andreas Schwab <aschwab@redhat.com>.
2009-07-16 Ulrich Drepper <drepper@redhat.com>
Jakub Jelinek <jakub@redhat.com> Jakub Jelinek <jakub@redhat.com>
* malloc/malloc.c [ATOMIC_FASTBINS] (_int_free): Make check for * malloc/malloc.c [ATOMIC_FASTBINS] (_int_free): Make check for

2
nscd/aicache.c
View File

@ -543,8 +543,6 @@ next_nip:
(void) cache_add (req->type, key_copy, req->key_len, &dataset->head, (void) cache_add (req->type, key_copy, req->key_len, &dataset->head,
true, db, uid, he == NULL); true, db, uid, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;

8
nscd/grpcache.c
View File

@ -146,8 +146,6 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, req->key_len, (void) cache_add (req->type, &dataset->strdata, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -367,12 +365,10 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (GETGRBYGID, cp, key_offset, &dataset->head, (void) cache_add (GETGRBYGID, cp, key_offset, &dataset->head,
false, db, owner, false); false, db, owner, false);
} }
}
}
out: out:
pthread_rwlock_unlock (&db->lock);
}
}
if (__builtin_expect (written != total, 0) && debug_level > 0) if (__builtin_expect (written != total, 0) && debug_level > 0)
{ {
char buf[256]; char buf[256];

4
nscd/hstcache.c
View File

@ -153,8 +153,6 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, req->key_len, (void) cache_add (req->type, &dataset->strdata, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -404,8 +402,6 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
} }
} }

4
nscd/initgrcache.c
View File

@ -230,8 +230,6 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, uid, he == NULL); &dataset->head, true, db, uid, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -388,8 +386,6 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (INITGROUPS, cp, req->key_len, &dataset->head, true, (void) cache_add (INITGROUPS, cp, req->key_len, &dataset->head, true,
db, uid, he == NULL); db, uid, he == NULL);
pthread_rwlock_unlock (&db->lock);
} }
} }

6
nscd/mem.c
View File

@ -566,9 +566,6 @@ mempool_alloc (struct database_dyn *db, size_t len, int data_alloc)
} }
} }
if (data_alloc)
pthread_rwlock_unlock (&db->lock);
if (! db->last_alloc_failed) if (! db->last_alloc_failed)
{ {
dbg_log (_("no more memory for database '%s'"), dbnames[db - dbs]); dbg_log (_("no more memory for database '%s'"), dbnames[db - dbs]);
@ -591,5 +588,8 @@ mempool_alloc (struct database_dyn *db, size_t len, int data_alloc)
pthread_mutex_unlock (&db->memlock); pthread_mutex_unlock (&db->memlock);
if (data_alloc)
pthread_rwlock_unlock (&db->lock);
return res; return res;
} }

8
nscd/pwdcache.c
View File

@ -153,8 +153,6 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -362,12 +360,10 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (GETPWBYUID, cp, key_offset, &dataset->head, (void) cache_add (GETPWBYUID, cp, key_offset, &dataset->head,
false, db, owner, false); false, db, owner, false);
} }
}
}
out: out:
pthread_rwlock_unlock (&db->lock);
}
}
if (__builtin_expect (written != total, 0) && debug_level > 0) if (__builtin_expect (written != total, 0) && debug_level > 0)
{ {
char buf[256]; char buf[256];

4
nscd/servicescache.c
View File

@ -136,8 +136,6 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, req->key_len, (void) cache_add (req->type, &dataset->strdata, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -317,8 +315,6 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
} }
} }