|
 |
dfa500 |
commit d93769405996dfc11d216ddbe415946617b5a494
|
|
|
dfa500 |
Author: Andreas Schwab <schwab@suse.de>
|
|
|
dfa500 |
Date: Mon Jan 20 17:01:50 2020 +0100
|
|
|
dfa500 |
|
|
|
dfa500 |
Fix array overflow in backtrace on PowerPC (bug 25423)
|
|
|
dfa500 |
|
|
|
dfa500 |
When unwinding through a signal frame the backtrace function on PowerPC
|
|
|
dfa500 |
didn't check array bounds when storing the frame address. Fixes commit
|
|
|
dfa500 |
d400dcac5e ("PowerPC: fix backtrace to handle signal trampolines").
|
|
|
dfa500 |
|
|
|
dfa500 |
diff --git a/debug/tst-backtrace5.c b/debug/tst-backtrace5.c
|
|
|
dfa500 |
index e7ce410845..b2f46160e7 100644
|
|
|
dfa500 |
--- a/debug/tst-backtrace5.c
|
|
|
dfa500 |
+++ b/debug/tst-backtrace5.c
|
|
|
dfa500 |
@@ -89,6 +89,18 @@ handle_signal (int signum)
|
|
|
dfa500 |
}
|
|
|
dfa500 |
/* Symbol names are not available for static functions, so we do not
|
|
|
dfa500 |
check do_test. */
|
|
|
dfa500 |
+
|
|
|
dfa500 |
+ /* Check that backtrace does not return more than what fits in the array
|
|
|
dfa500 |
+ (bug 25423). */
|
|
|
dfa500 |
+ for (int j = 0; j < NUM_FUNCTIONS; j++)
|
|
|
dfa500 |
+ {
|
|
|
dfa500 |
+ n = backtrace (addresses, j);
|
|
|
dfa500 |
+ if (n > j)
|
|
|
dfa500 |
+ {
|
|
|
dfa500 |
+ FAIL ();
|
|
|
dfa500 |
+ return;
|
|
|
dfa500 |
+ }
|
|
|
dfa500 |
+ }
|
|
|
dfa500 |
}
|
|
|
dfa500 |
|
|
|
dfa500 |
NO_INLINE int
|
|
|
dfa500 |
diff --git a/sysdeps/powerpc/powerpc32/backtrace.c b/sysdeps/powerpc/powerpc32/backtrace.c
|
|
|
dfa500 |
index 7c2d4726f8..d1456c8ae4 100644
|
|
|
dfa500 |
--- a/sysdeps/powerpc/powerpc32/backtrace.c
|
|
|
dfa500 |
+++ b/sysdeps/powerpc/powerpc32/backtrace.c
|
|
|
dfa500 |
@@ -114,6 +114,8 @@ __backtrace (void **array, int size)
|
|
|
dfa500 |
}
|
|
|
dfa500 |
if (gregset)
|
|
|
dfa500 |
{
|
|
|
dfa500 |
+ if (count + 1 == size)
|
|
|
dfa500 |
+ break;
|
|
|
dfa500 |
array[++count] = (void*)((*gregset)[PT_NIP]);
|
|
|
dfa500 |
current = (void*)((*gregset)[PT_R1]);
|
|
|
dfa500 |
}
|
|
|
dfa500 |
diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64/backtrace.c
|
|
|
dfa500 |
index 65c260ab76..8a53a1088f 100644
|
|
|
dfa500 |
--- a/sysdeps/powerpc/powerpc64/backtrace.c
|
|
|
dfa500 |
+++ b/sysdeps/powerpc/powerpc64/backtrace.c
|
|
|
dfa500 |
@@ -87,6 +87,8 @@ __backtrace (void **array, int size)
|
|
|
dfa500 |
if (is_sigtramp_address (current->return_address))
|
|
|
dfa500 |
{
|
|
|
dfa500 |
struct signal_frame_64 *sigframe = (struct signal_frame_64*) current;
|
|
|
dfa500 |
+ if (count + 1 == size)
|
|
|
dfa500 |
+ break;
|
|
|
dfa500 |
array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
|
|
|
dfa500 |
current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1];
|
|
|
dfa500 |
}
|