summaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2009-07-16 10:10:10 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-16 10:10:10 -0700
commit137028b4d7e50f71906c1656c27079eac5a1d085 (patch)
tree61b121088c68e50ff2483cd15675729cf3c337e7 /nscd
parent50158f95525ca59459a90f2a7bc65ceb892a0807 (diff)
downloadglibc-137028b4d7e50f71906c1656c27079eac5a1d085.tar.gz
Fix lock handling in memory hander of nscd.
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.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/aicache.c2
-rw-r--r--nscd/grpcache.c6
-rw-r--r--nscd/hstcache.c4
-rw-r--r--nscd/initgrcache.c4
-rw-r--r--nscd/mem.c6
-rw-r--r--nscd/pwdcache.c6
-rw-r--r--nscd/servicescache.c4
7 files changed, 5 insertions, 27 deletions
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 524c0a63af..8dac48e5c2 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -543,8 +543,6 @@ next_nip:
(void) cache_add (req->type, key_copy, req->key_len, &dataset->head,
true, db, uid, he == NULL);
- pthread_rwlock_unlock (&db->lock);
-
/* Mark the old entry as obsolete. */
if (dh != NULL)
dh->usable = false;
diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 184d53898c..fc2008449e 100644
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -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,
&dataset->head, true, db, owner, he == NULL);
- pthread_rwlock_unlock (&db->lock);
-
/* Mark the old entry as obsolete. */
if (dh != NULL)
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,
false, db, owner, false);
}
-
- out:
- pthread_rwlock_unlock (&db->lock);
}
}
+out:
if (__builtin_expect (written != total, 0) && debug_level > 0)
{
char buf[256];
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 51e2273960..77ffcdf880 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -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,
&dataset->head, true, db, owner, he == NULL);
- pthread_rwlock_unlock (&db->lock);
-
/* Mark the old entry as obsolete. */
if (dh != NULL)
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,
&dataset->head, true, db, owner, he == NULL);
-
- pthread_rwlock_unlock (&db->lock);
}
}
diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index c33aaf315f..f8d4742d16 100644
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -230,8 +230,6 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, uid, he == NULL);
- pthread_rwlock_unlock (&db->lock);
-
/* Mark the old entry as obsolete. */
if (dh != NULL)
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,
db, uid, he == NULL);
-
- pthread_rwlock_unlock (&db->lock);
}
}
diff --git a/nscd/mem.c b/nscd/mem.c
index fcea6dbd03..80ea951146 100644
--- a/nscd/mem.c
+++ b/nscd/mem.c
@@ -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)
{
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);
+ if (data_alloc)
+ pthread_rwlock_unlock (&db->lock);
+
return res;
}
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 2338e7e1e0..fc5b44eef0 100644
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -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,
&dataset->head, true, db, owner, he == NULL);
- pthread_rwlock_unlock (&db->lock);
-
/* Mark the old entry as obsolete. */
if (dh != NULL)
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,
false, db, owner, false);
}
-
- out:
- pthread_rwlock_unlock (&db->lock);
}
}
+out:
if (__builtin_expect (written != total, 0) && debug_level > 0)
{
char buf[256];
diff --git a/nscd/servicescache.c b/nscd/servicescache.c
index dc98d3005a..c965c972a3 100644
--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
@@ -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,
&dataset->head, true, db, owner, he == NULL);
- pthread_rwlock_unlock (&db->lock);
-
/* Mark the old entry as obsolete. */
if (dh != NULL)
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,
&dataset->head, true, db, owner, he == NULL);
-
- pthread_rwlock_unlock (&db->lock);
}
}