From d0b9f50b05c2465ddcc4ff526e3ed8e1eef98224 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 31 May 2021 10:11:56 +0200 Subject: [PATCH] Auto-sync with upstream branch master Upstream commit: 271ec55d0ae795f03d92e3aa61bff69a31a19e3a - support: Do not build xpthread_attr_setaffinity_np for hurd - nptl: Add pthread_attr_setaffinity_np failure test - support: Add xpthread_attr_setaffinity_np wrapper - nptl: Move createthread to pthread_create - nptl: Move Linux createthread to nptl - nptl: Install SIGSETXID handler with SA_ONSTACK [BZ #27914] - aarch64: Added optimized memset for A64FX - aarch64: Added optimized memcpy and memmove for A64FX - benchtests: Fixed bench-memcpy-random: buf1: mprotect failed - aarch64: Added Vector Length Set test helper script - aarch64: define BTI_C and BTI_J macros as NOP unless HAVE_AARCH64_BTI - config: Added HAVE_AARCH64_SVE_ASM for aarch64 - tst-mallinfo2.c: Use correct multiple for total variable --- glibc-sigsetxid-sa_onstack.patch | 36 -------------------------------- glibc.spec | 23 +++++++++++++++++--- sources | 2 +- 3 files changed, 21 insertions(+), 40 deletions(-) delete mode 100644 glibc-sigsetxid-sa_onstack.patch diff --git a/glibc-sigsetxid-sa_onstack.patch b/glibc-sigsetxid-sa_onstack.patch deleted file mode 100644 index 05e4204..0000000 --- a/glibc-sigsetxid-sa_onstack.patch +++ /dev/null @@ -1,36 +0,0 @@ -Emergency backport of this change prior to upstream acceptance: - -Author: Florian Weimer -Date: Wed May 26 07:13:00 2021 +0200 - - nptl: Install SIGSETXID handler with SA_ONSTACK [BZ #27914] - - The signal is sent to all threads, some of which may have switched - to very small stacks. If they have also installed an alternate - signal stack, SA_ONSTACK makes this work. The Go runtime needs this: - - runtime: C.setuid/C.setgid smashes Go stack - - - Doing this for SIGCANCEL is less obviously beneficial and needs further - testing. - -diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c -index 5680687efe7089da..b7073a828549d24c 100644 ---- a/nptl/pthread_create.c -+++ b/nptl/pthread_create.c -@@ -83,9 +83,12 @@ late_init (void) - (void) __libc_sigaction (SIGCANCEL, &sa, NULL); - } - -- /* Install the handle to change the threads' uid/gid. */ -+ /* Install the handle to change the threads' uid/gid. Use -+ SA_ONSTACK because the signal may be sent to threads that are -+ running with custom stacks. (This is less likely for -+ SIGCANCEL.) */ - sa.sa_sigaction = __nptl_setxid_sighandler; -- sa.sa_flags = SA_SIGINFO | SA_RESTART; -+ sa.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_RESTART; - (void) __libc_sigaction (SIGSETXID, &sa, NULL); - - /* The parent process might have left the signals blocked. Just in diff --git a/glibc.spec b/glibc.spec index 83dbab5..fb5ce0f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.33.9000-642-gac0353af81 +%define glibcsrcdir glibc-2.33.9000-655-g271ec55d0a %define glibcversion 2.33.9000 # Pre-release tarballs are pulled in from git using a command that is # effectively: @@ -97,7 +97,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 10%{?dist} +Release: 11%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -170,7 +170,6 @@ Patch23: glibc-python3.patch Patch29: glibc-fedora-nsswitch.patch Patch30: glibc-deprecated-selinux-makedb.patch Patch31: glibc-deprecated-selinux-nscd.patch -Patch32: glibc-sigsetxid-sa_onstack.patch ############################################################################## # Continued list of core "glibc" package information: @@ -2113,6 +2112,24 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Mon May 31 2021 Florian Weimer - 2.33.9000-11 +- glibc-sigsetxid-sa_onstack.patch was applied upstream +- Auto-sync with upstream branch master, + commit 271ec55d0ae795f03d92e3aa61bff69a31a19e3a: +- support: Do not build xpthread_attr_setaffinity_np for hurd +- nptl: Add pthread_attr_setaffinity_np failure test +- support: Add xpthread_attr_setaffinity_np wrapper +- nptl: Move createthread to pthread_create +- nptl: Move Linux createthread to nptl +- nptl: Install SIGSETXID handler with SA_ONSTACK [BZ #27914] +- aarch64: Added optimized memset for A64FX +- aarch64: Added optimized memcpy and memmove for A64FX +- benchtests: Fixed bench-memcpy-random: buf1: mprotect failed +- aarch64: Added Vector Length Set test helper script +- aarch64: define BTI_C and BTI_J macros as NOP unless HAVE_AARCH64_BTI +- config: Added HAVE_AARCH64_SVE_ASM for aarch64 +- tst-mallinfo2.c: Use correct multiple for total variable + * Wed May 26 2021 Florian Weimer - 2.33.9000-10 - nptl: Install SIGSETXID handler with SA_ONSTACK [BZ #27914] diff --git a/sources b/sources index db98691..9e9164b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.33.9000-642-gac0353af81.tar.xz) = 29755bdd1854923255670c55152ebe7f0fe319f16365dc1b5ff22786aa4c2b89dde86075690beb8a5a606fea3a7e2663cd8dc6ffeae77dd7a848c5075766df89 +SHA512 (glibc-2.33.9000-655-g271ec55d0a.tar.xz) = 7d1605ed459aa2ff389946d600af298c671fa0e06d849ef2f5e352372e0f1775cb8ae6fbfe52edde7314b3077078e4f501d41a7d238033c226b104b129322b76