mirror of git://sourceware.org/git/glibc.git
Fix array overflow in backtrace on PowerPC (bug 25423)
When unwinding through a signal frame the backtrace function on PowerPC
didn't check array bounds when storing the frame address. Fixes commit
d400dcac5e
("PowerPC: fix backtrace to handle signal trampolines").
This commit is contained in:
parent
8b222fa387
commit
d937694059
|
@ -89,6 +89,18 @@ handle_signal (int signum)
|
||||||
}
|
}
|
||||||
/* Symbol names are not available for static functions, so we do not
|
/* Symbol names are not available for static functions, so we do not
|
||||||
check do_test. */
|
check do_test. */
|
||||||
|
|
||||||
|
/* Check that backtrace does not return more than what fits in the array
|
||||||
|
(bug 25423). */
|
||||||
|
for (int j = 0; j < NUM_FUNCTIONS; j++)
|
||||||
|
{
|
||||||
|
n = backtrace (addresses, j);
|
||||||
|
if (n > j)
|
||||||
|
{
|
||||||
|
FAIL ();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NO_INLINE int
|
NO_INLINE int
|
||||||
|
|
|
@ -114,6 +114,8 @@ __backtrace (void **array, int size)
|
||||||
}
|
}
|
||||||
if (gregset)
|
if (gregset)
|
||||||
{
|
{
|
||||||
|
if (count + 1 == size)
|
||||||
|
break;
|
||||||
array[++count] = (void*)((*gregset)[PT_NIP]);
|
array[++count] = (void*)((*gregset)[PT_NIP]);
|
||||||
current = (void*)((*gregset)[PT_R1]);
|
current = (void*)((*gregset)[PT_R1]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,6 +87,8 @@ __backtrace (void **array, int size)
|
||||||
if (is_sigtramp_address (current->return_address))
|
if (is_sigtramp_address (current->return_address))
|
||||||
{
|
{
|
||||||
struct signal_frame_64 *sigframe = (struct signal_frame_64*) current;
|
struct signal_frame_64 *sigframe = (struct signal_frame_64*) current;
|
||||||
|
if (count + 1 == size)
|
||||||
|
break;
|
||||||
array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
|
array[++count] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP];
|
||||||
current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1];
|
current = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_R1];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue