Import glibc-2.34-11.fc35 from f35 (#2027789)

Resolves: #2027789
This commit is contained in:
Florian Weimer 2021-12-07 17:46:21 +01:00
parent e1b9a6cb31
commit 08427423f5
2 changed files with 28 additions and 1 deletions

23
glibc-rh2027789.patch Normal file
View File

@ -0,0 +1,23 @@
Downstream-only patch from Mark Wielaard <mjw@redhat.com> to avoid a
crash in backtrace if the vDSO is not available.
Upstream, this code was removed in commit 82fd7314c7df8c5555dce02
("powerpc: Remove backtrace implementation"), so patch is not needed
there.
diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c
index 37de9b5bdd73c316..0ffa7509dfa4862a 100644
--- a/sysdeps/powerpc/powerpc64/backtrace.c
+++ b/sysdeps/powerpc/powerpc64/backtrace.c
@@ -68,8 +68,9 @@ static inline bool
is_sigtramp_address (void *nip)
{
#ifdef HAVE_SIGTRAMP_RT64
- if (nip == GLRO (dl_vdso_sigtramp_rt64) ||
- nip == GLRO (dl_vdso_sigtramp_rt64) + 4)
+ if ((nip == GLRO (dl_vdso_sigtramp_rt64) ||
+ nip == GLRO (dl_vdso_sigtramp_rt64) + 4)
+ && nip != NULL)
return true;
#endif
return false;

View File

@ -151,7 +151,7 @@ end \
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 10%{?dist} Release: 11%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries. # libraries.
@ -280,6 +280,7 @@ Patch77: glibc-upstream-2.34-46.patch
Patch78: glibc-upstream-2.34-47.patch Patch78: glibc-upstream-2.34-47.patch
Patch79: glibc-upstream-2.34-48.patch Patch79: glibc-upstream-2.34-48.patch
Patch80: glibc-upstream-2.34-49.patch Patch80: glibc-upstream-2.34-49.patch
Patch81: glibc-rh2027789.patch
############################################################################## ##############################################################################
# Continued list of core "glibc" package information: # Continued list of core "glibc" package information:
@ -2311,6 +2312,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Tue Dec 7 2021 Florian Weimer <fweimer@redhat.com> - 2.34-11
- backtrace function crashes without vDSO on ppc64le (#2027789)
* Fri Dec 3 2021 Florian Weimer <fweimer@redhat.com> - 2.34-10 * Fri Dec 3 2021 Florian Weimer <fweimer@redhat.com> - 2.34-10
- Sync with upstream branch release/2.34/master, - Sync with upstream branch release/2.34/master,
commit 387bff63dc2dccd62b09aa26dccf8cdc5f3c985c: commit 387bff63dc2dccd62b09aa26dccf8cdc5f3c985c: