diff --git a/elfutils-debuginfod.changes b/elfutils-debuginfod.changes index c88f92d..e4bfd4f 100644 --- a/elfutils-debuginfod.changes +++ b/elfutils-debuginfod.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 5 18:12:21 UTC 2021 - Martin Liška + +- Add tests-Allow-an-extra-pthread_kill-frame-in-backtrace.patch + in order to fix boo#1189083. + ------------------------------------------------------------------- Mon May 24 07:39:53 UTC 2021 - Martin Liška diff --git a/elfutils-debuginfod.spec b/elfutils-debuginfod.spec index 33e0324..8fa13a1 100644 --- a/elfutils-debuginfod.spec +++ b/elfutils-debuginfod.spec @@ -29,6 +29,7 @@ Source1: https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfuti Source2: elfutils.changes Source3: elfutils.keyring Patch0: disable-run-readelf-self-test.patch +Patch1: tests-Allow-an-extra-pthread_kill-frame-in-backtrace.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison diff --git a/elfutils.changes b/elfutils.changes index 19329a9..cef3050 100644 --- a/elfutils.changes +++ b/elfutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 5 18:12:21 UTC 2021 - Martin Liška + +- Add tests-Allow-an-extra-pthread_kill-frame-in-backtrace.patch + in order to fix boo#1189083. + ------------------------------------------------------------------- Mon May 24 07:39:53 UTC 2021 - Martin Liška diff --git a/elfutils.spec b/elfutils.spec index ff90b32..2253de5 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -32,6 +32,7 @@ Source4: https://fedorahosted.org/releases/e/l/%{name}/%{version}/%{name} Source5: %{name}.keyring Source6: elfutils-rpmlintrc Patch0: disable-run-readelf-self-test.patch +Patch1: tests-Allow-an-extra-pthread_kill-frame-in-backtrace.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison diff --git a/tests-Allow-an-extra-pthread_kill-frame-in-backtrace.patch b/tests-Allow-an-extra-pthread_kill-frame-in-backtrace.patch new file mode 100644 index 0000000..50012c8 --- /dev/null +++ b/tests-Allow-an-extra-pthread_kill-frame-in-backtrace.patch @@ -0,0 +1,131 @@ +From 9aee0992d6e6ec4cce2c015d8da4b61022c6f6dd Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Wed, 4 Aug 2021 21:01:27 +0200 +Subject: [PATCH] tests: Allow an extra pthread_kill frame in backtrace tests + +glibc 2.34 calls pthread_kill from the raise function. Before raise +directly called the (tg)kill syscall. So allow pthread_kill to be the +first frame in a backtrace where raise is expected. Also change some +asserts to fprintf plus abort to make it more clear why the testcase +fails. + +https://sourceware.org/bugzilla/show_bug.cgi?id=28190 + +Signed-off-by: Mark Wielaard +--- + tests/ChangeLog | 6 +++++ + tests/backtrace.c | 61 +++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 60 insertions(+), 7 deletions(-) + +diff --git a/tests/backtrace.c b/tests/backtrace.c +index 36c8b8c4..afc12fb9 100644 +--- a/tests/backtrace.c ++++ b/tests/backtrace.c +@@ -97,6 +97,9 @@ callback_verify (pid_t tid, unsigned frameno, Dwarf_Addr pc, + static bool reduce_frameno = false; + if (reduce_frameno) + frameno--; ++ static bool pthread_kill_seen = false; ++ if (pthread_kill_seen) ++ frameno--; + if (! use_raise_jmp_patching && frameno >= 2) + frameno += 2; + const char *symname2 = NULL; +@@ -107,11 +110,26 @@ callback_verify (pid_t tid, unsigned frameno, Dwarf_Addr pc, + && (strcmp (symname, "__kernel_vsyscall") == 0 + || strcmp (symname, "__libc_do_syscall") == 0)) + reduce_frameno = true; ++ else if (! pthread_kill_seen && symname ++ && strstr (symname, "pthread_kill") != NULL) ++ pthread_kill_seen = true; + else +- assert (symname && strcmp (symname, "raise") == 0); ++ { ++ if (!symname || strcmp (symname, "raise") != 0) ++ { ++ fprintf (stderr, ++ "case 0: expected symname 'raise' got '%s'\n", symname); ++ abort (); ++ } ++ } + break; + case 1: +- assert (symname != NULL && strcmp (symname, "sigusr2") == 0); ++ if (symname == NULL || strcmp (symname, "sigusr2") != 0) ++ { ++ fprintf (stderr, ++ "case 1: expected symname 'sigusr2' got '%s'\n", symname); ++ abort (); ++ } + break; + case 2: // x86_64 only + /* __restore_rt - glibc maybe does not have to have this symbol. */ +@@ -120,11 +138,21 @@ callback_verify (pid_t tid, unsigned frameno, Dwarf_Addr pc, + if (use_raise_jmp_patching) + { + /* Verify we trapped on the very first instruction of jmp. */ +- assert (symname != NULL && strcmp (symname, "jmp") == 0); ++ if (symname == NULL || strcmp (symname, "jmp") != 0) ++ { ++ fprintf (stderr, ++ "case 3: expected symname 'raise' got '%s'\n", symname); ++ abort (); ++ } + mod = dwfl_addrmodule (dwfl, pc - 1); + if (mod) + symname2 = dwfl_module_addrname (mod, pc - 1); +- assert (symname2 == NULL || strcmp (symname2, "jmp") != 0); ++ if (symname2 == NULL || strcmp (symname2, "jmp") != 0) ++ { ++ fprintf (stderr, ++ "case 3: expected symname2 'jmp' got '%s'\n", symname2); ++ abort (); ++ } + break; + } + FALLTHROUGH; +@@ -137,11 +165,22 @@ callback_verify (pid_t tid, unsigned frameno, Dwarf_Addr pc, + duplicate_sigusr2 = true; + break; + } +- assert (symname != NULL && strcmp (symname, "stdarg") == 0); ++ if (symname == NULL || strcmp (symname, "stdarg") != 0) ++ { ++ fprintf (stderr, ++ "case 4: expected symname 'stdarg' got '%s'\n", symname); ++ abort (); ++ } + break; + case 5: + /* Verify we trapped on the very last instruction of child. */ +- assert (symname != NULL && strcmp (symname, "backtracegen") == 0); ++ if (symname == NULL || strcmp (symname, "backtracegen") != 0) ++ { ++ fprintf (stderr, ++ "case 5: expected symname 'backtracegen' got '%s'\n", ++ symname); ++ abort (); ++ } + mod = dwfl_addrmodule (dwfl, pc); + if (mod) + symname2 = dwfl_module_addrname (mod, pc); +@@ -151,7 +190,15 @@ callback_verify (pid_t tid, unsigned frameno, Dwarf_Addr pc, + // instructions or even inserts some padding instructions at the end + // (which apparently happens on ppc64). + if (use_raise_jmp_patching) +- assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0); ++ { ++ if (symname2 != NULL && strcmp (symname2, "backtracegen") == 0) ++ { ++ fprintf (stderr, ++ "use_raise_jmp_patching didn't expect symname2 " ++ "'backtracegen'\n"); ++ abort (); ++ } ++ } + break; + } + } +-- +2.32.0 +