mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 10:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[BZ #2571]

Browse Source 
* nscd/nscd_helper.c (__nscd_get_map_ref): Make mapptr argument a
	volatile pointer so that the mapptr->mapped value is re-read after
	the lock is retrieved.
	* nscd/nscd-client.h: Update __nscd_get_map_ref prototype.

	* sysdeps/unix/sysv/linux/ia64/clone2.S: Check for NULL stack
This commit is contained in:
Ulrich Drepper 2006-04-25 23:50:31 +00:00
parent 5178e13aa2
commit 388df58d9b
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,11 @@
2006-04-25 Ulrich Drepper <drepper@redhat.com> 2006-04-25 Ulrich Drepper <drepper@redhat.com>
[BZ #2571]
* nscd/nscd_helper.c (__nscd_get_map_ref): Make mapptr argument a
volatile pointer so that the mapptr->mapped value is re-read after
the lock is retrieved.
* nscd/nscd-client.h: Update __nscd_get_map_ref prototype.
* include/features.h [_GNU_SOURCE] (_POSIX_C_SOURCE): Define to * include/features.h [_GNU_SOURCE] (_POSIX_C_SOURCE): Define to
200112L. 200112L.
@ -12,7 +18,7 @@
(struct hconf): Replace service related fields with placeholders. (struct hconf): Replace service related fields with placeholders.
[BZ #2386] [BZ #2386]
* sysdeps/unix/sysv/linux/ia64/clone2.S: Check for NULL stakc * sysdeps/unix/sysv/linux/ia64/clone2.S: Check for NULL stack
pointers to match other architectures. pointers to match other architectures.
* sysdeps/unix/sysv/linux/Makefile [subdirs=misc] (tests): Add * sysdeps/unix/sysv/linux/Makefile [subdirs=misc] (tests): Add
tst-clone. tst-clone.

4
nscd/nscd-client.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 1998, 1999, 2000, 2003, 2004, 2005 /* Copyright (c) 1998, 1999, 2000, 2003, 2004, 2005, 2006
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
@ -277,7 +277,7 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
/* Get reference of mapping. */ /* Get reference of mapping. */
extern struct mapped_database *__nscd_get_map_ref (request_type type, extern struct mapped_database *__nscd_get_map_ref (request_type type,
const char *name, const char *name,
struct locked_map_ptr *mapptr, volatile struct locked_map_ptr *mapptr,
int *gc_cyclep); int *gc_cyclep);
/* Unmap database. */ /* Unmap database. */

10
nscd/nscd_helper.c
View File

@ -316,17 +316,18 @@ get_mapping (request_type type, const char *key,
struct mapped_database * struct mapped_database *
__nscd_get_map_ref (request_type type, const char *name, __nscd_get_map_ref (request_type type, const char *name,
struct locked_map_ptr *mapptr, int *gc_cyclep) volatile struct locked_map_ptr *mapptr, int *gc_cyclep)
{ {
struct mapped_database *cur = mapptr->mapped; struct mapped_database *cur = mapptr->mapped;
if (cur == NO_MAPPING) if (cur == NO_MAPPING)
return cur; return cur;
int cnt = 0; int cnt = 0;
while (atomic_compare_and_exchange_val_acq (&mapptr->lock, 1, 0) != 0) while (__builtin_expect (atomic_compare_and_exchange_val_acq (&mapptr->lock,
1, 0) != 0, 0))
{ {
// XXX Best number of rounds? // XXX Best number of rounds?
if (++cnt > 5) if (__builtin_expect (++cnt > 5, 0))
return NO_MAPPING; return NO_MAPPING;
atomic_delay (); atomic_delay ();
@ -340,7 +341,8 @@ __nscd_get_map_ref (request_type type, const char *name,
if (cur == NULL if (cur == NULL
|| (cur->head->nscd_certainly_running == 0 || (cur->head->nscd_certainly_running == 0
&& cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))) && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
cur = get_mapping (type, name, &mapptr->mapped); cur = get_mapping (type, name,
(struct mapped_database **) &mapptr->mapped);
if (__builtin_expect (cur != NO_MAPPING, 1)) if (__builtin_expect (cur != NO_MAPPING, 1))
{ {