From: Florian Weimer Date: Mon, 15 Jan 2018 15:05:36 +0000 (+0100) Subject: nptl: Open libgcc.so with RTLD_NOW during pthread_cancel [BZ #22636] X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e75e676da29d95cf8fbef1b1a441a40cba7ac2b;p=thirdparty%2Fglibc.git nptl: Open libgcc.so with RTLD_NOW during pthread_cancel [BZ #22636] Disabling lazy binding reduces stack usage during unwinding. Note that RTLD_NOW only makes a difference if libgcc.so has not already been loaded, so this is only a partial fix. Reviewed-by: Adhemerval Zanella (cherry picked from commit f993b8754080ac7572b692870e926d8b493db16c) --- diff --git a/ChangeLog b/ChangeLog index 0e80c8e4c66..2cdd0811168 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-01-10 Florian Weimer + + [BZ #22636] + * sysdeps/nptl/unwind-forcedunwind.c (pthread_cancel_init): Open + libgcc.so with RTLD_NOW, to avoid lazy binding during unwind. + 2018-01-08 Szabolcs Nagy [BZ #22637] diff --git a/NEWS b/NEWS index fb54fa069c2..e7eba7610dd 100644 --- a/NEWS +++ b/NEWS @@ -66,6 +66,7 @@ The following bugs are resolved with this release: [21972] assert macro requires operator== (int) for its argument type [22078] nss_files performance issue in hosts multi mode [22322] libc: [mips64] wrong bits/long-double.h installed + [22636] PTHREAD_STACK_MIN is too small on x86-64 [22627] $ORIGIN in $LD_LIBRARY_PATH is substituted twice [22637] nptl: Fix stack guard size accounting [22679] getcwd(3) can succeed without returning an absolute path diff --git a/sysdeps/nptl/unwind-forcedunwind.c b/sysdeps/nptl/unwind-forcedunwind.c index 33a1975f5e6..ace58b2468d 100644 --- a/sysdeps/nptl/unwind-forcedunwind.c +++ b/sysdeps/nptl/unwind-forcedunwind.c @@ -49,7 +49,7 @@ pthread_cancel_init (void) return; } - handle = __libc_dlopen (LIBGCC_S_SO); + handle = __libc_dlopen_mode (LIBGCC_S_SO, RTLD_NOW | __RTLD_DLOPEN); if (handle == NULL || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL