From 1e766c498cad28aacc9c6bbc2bc37f160ffc67aa Mon Sep 17 00:00:00 2001 From: xujing Date: Sun, 9 Oct 2022 16:42:23 +0800 Subject: [PATCH] backport upstream patches --- ...r-pointer-to-static-dlopen-implement.patch | 31 +++ ...early_init-for-reused-namespaces-bug.patch | 221 ++++++++++++++++++ glibc.spec | 10 +- 3 files changed, 260 insertions(+), 2 deletions(-) create mode 100644 dlfcn-Pass-caller-pointer-to-static-dlopen-implement.patch create mode 100644 elf-Call-__libc_early_init-for-reused-namespaces-bug.patch diff --git a/dlfcn-Pass-caller-pointer-to-static-dlopen-implement.patch b/dlfcn-Pass-caller-pointer-to-static-dlopen-implement.patch new file mode 100644 index 0000000..0b49ec3 --- /dev/null +++ b/dlfcn-Pass-caller-pointer-to-static-dlopen-implement.patch @@ -0,0 +1,31 @@ +From ed0185e4129130cbe081c221efb758fb400623ce Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Thu, 4 Aug 2022 17:54:48 +0200 +Subject: [PATCH] dlfcn: Pass caller pointer to static dlopen implementation + (bug 29446) + +Conflict:NA +Reference:https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=ed0185e4129130cbe081c221efb758fb400623ce + +Fixes commit 0c1c3a771eceec46e66ce1183cf988e2303bd373 ("dlfcn: Move +dlopen into libc"). +--- + dlfcn/dlopen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c +index 2696dde4b1..9b07b4e132 100644 +--- a/dlfcn/dlopen.c ++++ b/dlfcn/dlopen.c +@@ -90,7 +90,7 @@ compat_symbol (libdl, ___dlopen, dlopen, GLIBC_2_1); + void * + __dlopen (const char *file, int mode, void *dl_caller) + { +- return dlopen_implementation (file, mode, RETURN_ADDRESS (0)); ++ return dlopen_implementation (file, mode, dl_caller); + } + + void * +-- +2.27.0 + diff --git a/elf-Call-__libc_early_init-for-reused-namespaces-bug.patch b/elf-Call-__libc_early_init-for-reused-namespaces-bug.patch new file mode 100644 index 0000000..4985f74 --- /dev/null +++ b/elf-Call-__libc_early_init-for-reused-namespaces-bug.patch @@ -0,0 +1,221 @@ +From d0e357ff45a75553dee3b17ed7d303bfa544f6fe Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 26 Aug 2022 21:15:43 +0200 +Subject: [PATCH] elf: Call __libc_early_init for reused namespaces (bug 29528) + +Conflict:adapt context +Reference:https://sourceware.org/git/?p=glibc.git;a=commit;h=d0e357ff45a75553dee3b17ed7d303bfa544f6fe + +libc_map is never reset to NULL, neither during dlclose nor on a +dlopen call which reuses the namespace structure. As a result, if a +namespace is reused, its libc is not initialized properly. The most +visible result is a crash in the functions. + +To prevent similar bugs on namespace reuse from surfacing, +unconditionally initialize the chosen namespace to zero using memset. +--- + elf/Makefile | 7 +++++ + elf/dl-open.c | 13 ++++++---- + elf/tst-dlmopen-twice-mod1.c | 37 ++++++++++++++++++++++++++ + elf/tst-dlmopen-twice-mod2.c | 50 ++++++++++++++++++++++++++++++++++++ + elf/tst-dlmopen-twice.c | 34 ++++++++++++++++++++++++ + 5 files changed, 136 insertions(+), 5 deletions(-) + create mode 100644 elf/tst-dlmopen-twice-mod1.c + create mode 100644 elf/tst-dlmopen-twice-mod2.c + create mode 100644 elf/tst-dlmopen-twice.c + +diff --git a/elf/Makefile b/elf/Makefile +index 3928a08787..008770bfaf 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -410,6 +410,7 @@ tests += \ + tst-dlmopen3 \ + tst-dlmopen-dlerror \ + tst-dlmopen-gethostbyname \ ++ tst-dlmopen-twice \ + tst-dlopenfail \ + tst-dlopenfail-2 \ + tst-dlopenrpath \ +@@ -839,6 +840,8 @@ modules-names += \ + tst-dlmopen1mod \ + tst-dlmopen-dlerror-mod \ + tst-dlmopen-gethostbyname-mod \ ++ tst-dlmopen-twice-mod1 \ ++ tst-dlmopen-twice-mod2 \ + tst-dlopenfaillinkmod \ + tst-dlopenfailmod1 \ + tst-dlopenfailmod2 \ +@@ -2976,3 +2979,7 @@ $(objpfx)tst-audit-tlsdesc.out: $(objpfx)tst-auditmod-tlsdesc.so + $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ + -Wl,--script=tst-ro-dynamic-mod.map \ + $(objpfx)tst-ro-dynamic-mod.os ++ ++$(objpfx)tst-dlmopen-twice.out: \ ++ $(objpfx)tst-dlmopen-twice-mod1.so \ ++ $(objpfx)tst-dlmopen-twice-mod2.so +diff --git a/elf/dl-open.c b/elf/dl-open.c +index a23e65926b..46e8066fd8 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -844,11 +844,14 @@ _dl_open (const char *file, int mode, const void *caller_dlopen, Lmid_t nsid, + _dl_signal_error (EINVAL, file, NULL, N_("\ + no more namespaces available for dlmopen()")); + } +- else if (nsid == GL(dl_nns)) +- { +- __rtld_lock_initialize (GL(dl_ns)[nsid]._ns_unique_sym_table.lock); +- ++GL(dl_nns); +- } ++ ++ if (nsid == GL(dl_nns)) ++ ++GL(dl_nns); ++ ++ /* Initialize the new namespace. Most members are ++ zero-initialized, only the lock needs special treatment. */ ++ memset (&GL(dl_ns)[nsid], 0, sizeof (GL(dl_ns)[nsid])); ++ __rtld_lock_initialize (GL(dl_ns)[nsid]._ns_unique_sym_table.lock); + + _dl_debug_initialize (0, nsid)->r_state = RT_CONSISTENT; + } +diff --git a/elf/tst-dlmopen-twice-mod1.c b/elf/tst-dlmopen-twice-mod1.c +new file mode 100644 +index 0000000000..0eaf04948c +--- /dev/null ++++ b/elf/tst-dlmopen-twice-mod1.c +@@ -0,0 +1,37 @@ ++/* Initialization of libc after dlmopen/dlclose/dlmopen (bug 29528). Module 1. ++ Copyright (C) 2022 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 ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++static void __attribute__ ((constructor)) ++init (void) ++{ ++ puts ("info: tst-dlmopen-twice-mod1.so loaded"); ++ fflush (stdout); ++} ++ ++static void __attribute__ ((destructor)) ++fini (void) ++{ ++ puts ("info: tst-dlmopen-twice-mod1.so about to be unloaded"); ++ fflush (stdout); ++} ++ ++/* Large allocation. The second module does not have this, so it ++ should load libc at a different address. */ ++char large_allocate[16 * 1024 * 1024]; +diff --git a/elf/tst-dlmopen-twice-mod2.c b/elf/tst-dlmopen-twice-mod2.c +new file mode 100644 +index 0000000000..40c6c01f96 +--- /dev/null ++++ b/elf/tst-dlmopen-twice-mod2.c +@@ -0,0 +1,50 @@ ++/* Initialization of libc after dlmopen/dlclose/dlmopen (bug 29528). Module 2. ++ Copyright (C) 2022 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 ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++static void __attribute__ ((constructor)) ++init (void) ++{ ++ puts ("info: tst-dlmopen-twice-mod2.so loaded"); ++ fflush (stdout); ++} ++ ++static void __attribute__ ((destructor)) ++fini (void) ++{ ++ puts ("info: tst-dlmopen-twice-mod2.so about to be unloaded"); ++ fflush (stdout); ++} ++ ++int ++run_check (void) ++{ ++ puts ("info: about to call isalpha"); ++ fflush (stdout); ++ ++ volatile char ch = 'a'; ++ if (!isalpha (ch)) ++ { ++ puts ("error: isalpha ('a') is not true"); ++ fflush (stdout); ++ return 1; ++ } ++ return 0; ++} +diff --git a/elf/tst-dlmopen-twice.c b/elf/tst-dlmopen-twice.c +new file mode 100644 +index 0000000000..449f3c8fa9 +--- /dev/null ++++ b/elf/tst-dlmopen-twice.c +@@ -0,0 +1,34 @@ ++/* Initialization of libc after dlmopen/dlclose/dlmopen (bug 29528). Main. ++ Copyright (C) 2022 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 ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ void *handle = xdlmopen (LM_ID_NEWLM, "tst-dlmopen-twice-mod1.so", RTLD_NOW); ++ xdlclose (handle); ++ handle = xdlmopen (LM_ID_NEWLM, "tst-dlmopen-twice-mod2.so", RTLD_NOW); ++ int (*run_check) (void) = xdlsym (handle, "run_check"); ++ TEST_COMPARE (run_check (), 0); ++ xdlclose (handle); ++ return 0; ++} ++ ++#include +-- +2.27.0 + diff --git a/glibc.spec b/glibc.spec index 2315a54..5d89287 100644 --- a/glibc.spec +++ b/glibc.spec @@ -66,7 +66,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 98 +Release: 99 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -235,6 +235,8 @@ Patch147: aarch64-Move-ld.so-_start-to-separate-file-and-drop-.patch Patch148: elf-Fix-DNDEBUG-warning-in-_dl_start_args_adjust.patch Patch149: nptl-Fix-___pthread_unregister_cancel_restore-asynch.patch Patch150: socket-Fix-mistyped-define-statement-in-socket-sys-s.patch +Patch151: elf-Call-__libc_early_init-for-reused-namespaces-bug.patch +Patch152: dlfcn-Pass-caller-pointer-to-static-dlopen-implement.patch Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch @@ -1416,7 +1418,11 @@ fi %endif %changelog -* Sun Oct 10 2022 Lv Ying - 2.34-98 +* Mon Oct 10 2022 xujing - 2.34-99 +- elf: Call __libc_early_init for reused namespaces (bug 29528) + dlfcn: Pass caller pointer to static dlopen implementation (bug 29446) + +* Mon Oct 10 2022 Lv Ying - 2.34-98 - elf: LD_HUGEPAGE_LIB HUGEPAGE_PROBE and LD_DEBUG no longer share GLRO(dl_debug_mask) elf: remove use-mlock-to-determine-hugepage-RLIMIT_MEMLOCK-soft-.patch