Skip to contentSkip to conversation

fix ptrace "unwind-to-user" code

PATCH New David Mosberger 1 participant 1 message May 10, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix ptrace "unwind-to-user" code

Tony,

Another patch that would be really good to get into 2.6.12...

	--david

[IA64] Correct convert_to_non_syscall()

convert_to_non_syscall() has the same problem that unwind_to_user() used to have. Fix it likewise.

Index: arch/ia64/kernel/ptrace.c
=================================--- 4efbd8a990df4437fb178c8a705dadc36812f98a/arch/ia64/kernel/ptrace.c (mode:100644) +++ uncommitted/arch/ia64/kernel/ptrace.c (mode:100644)
@@ -692,16 +692,30 @@
unsigned long cfm)
{
struct unw_frame_info info, prev_info;
- unsigned long ip, pr;
+ unsigned long ip, sp, pr;

unw_init_from_blocked_task(&info, child);
while (1) {
prev_info = info;
if (unw_unwind(&info) < 0)
return;
- if (unw_get_rp(&info, &ip) < 0)
+
+ unw_get_sp(&info, &sp);
+ if ((long)((unsigned long)child + IA64_STK_OFFSET - sp)
+ < IA64_PT_REGS_SIZE) {
+ dprintk("ptrace.%s: ran off the top of the kernel "
+ "stack\n", __FUNCTION__);
+ return;
+ }
+ if (unw_get_pr (&prev_info, &pr) < 0) {
+ unw_get_rp(&prev_info, &ip);
+ dprintk("ptrace.%s: failed to read "
+ "predicate register (ip=0x%lx)\n",
+ __FUNCTION__, ip);
return;
- if (ip < FIXADDR_USER_END)
+ }
+ if (unw_is_intr_frame(&info)
+ && (pr & (1UL << PRED_USER_STACK)))
break;
}