diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-07-26 06:44:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-07-26 06:44:46 +0000 |
| commit | bd3754dcf6aae7132b5b9959b3e0907475b42f62 (patch) | |
| tree | 0f317e6860a1950142678dfaa4ecec05574aed68 | |
| parent | a08336fb91681a5ad9d6fe225b1b7faa16b23a27 (diff) | |
| download | glibc-bd3754dcf6aae7132b5b9959b3e0907475b42f62.tar.gz glibc-bd3754dcf6aae7132b5b9959b3e0907475b42f62.tar.xz glibc-bd3754dcf6aae7132b5b9959b3e0907475b42f62.zip | |
* stdlib/cxa_finalize.c (__cxa_finalize): Fix race condition when
calling registered handler.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | stdlib/cxa_finalize.c | 24 |
2 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 3bfa2b6450..f298be522a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-07-25 Ulrich Drepper <drepper@redhat.com> + * stdlib/cxa_finalize.c (__cxa_finalize): Fix race condition when + calling registered handler. + * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Fix comment. * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise. diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c index 43fcbc484f..b013be8524 100644 --- a/stdlib/cxa_finalize.c +++ b/stdlib/cxa_finalize.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1999,2001,2002,2003,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -36,17 +36,21 @@ __cxa_finalize (void *d) struct exit_function *f; for (f = &funcs->fns[funcs->idx - 1]; f >= &funcs->fns[0]; --f) - if ((d == NULL || d == f->func.cxa.dso_handle) - /* We don't want to run this cleanup more than once. */ - && ! atomic_compare_and_exchange_bool_acq (&f->flavor, ef_free, - ef_cxa)) - { - void (*cxafn) (void *arg, int status) = f->func.cxa.fn; + { + void (*cxafn) (void *arg, int status); + + if ((d == NULL || d == f->func.cxa.dso_handle) + /* We don't want to run this cleanup more than once. */ + && (cxafn = f->func.cxa.fn, + ! atomic_compare_and_exchange_bool_acq (&f->flavor, ef_free, + ef_cxa))) + { #ifdef PTR_DEMANGLE - PTR_DEMANGLE (cxafn); + PTR_DEMANGLE (cxafn); #endif - cxafn (f->func.cxa.arg, 0); - } + cxafn (f->func.cxa.arg, 0); + } + } } /* Remove the registered fork handlers. We do not have to |