Skip to contentSkip to conversation

s390: ptrace: don't abuse PT_PTRACED

PATCH Applied Oleg Nesterov 3 participants 3 messages Dec 9, 2009 s390

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390: ptrace: don't abuse PT_PTRACED

Untested, but hopefully trivial enough and should't change the compiled code.

Nobody except ptrace itself should use task->ptrace or PT_PTRACED directly, change arch/s390/kernel/traps.c to use the helper.

---

 arch/s390/kernel/traps.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/s390/kernel/traps.c renamed from arch/s390/kernel/traps.c~S390_DONT_ABUSE_PT_PTRACED +3 -3
@@ -18,7 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
-#include <linux/ptrace.h>
+#include <linux/tracehook.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
@@ -382,7 +382,7 @@ void __kprobes do_single_step(struct pt_
 					SIGTRAP) == NOTIFY_STOP){
 		return;
 	}
-	if ((current->ptrace & PT_PTRACED) != 0)
+	if (tracehook_consider_fatal_signal(current, SIGTRAP))
 		force_sig(SIGTRAP, current);
 }
 
@@ -483,7 +483,7 @@ static void illegal_op(struct pt_regs * 
 		if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
 			return;
 		if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
-			if (current->ptrace & PT_PTRACED)
+			if (tracehook_consider_fatal_signal(current, SIGTRAP))
 				force_sig(SIGTRAP, current);
 			else
 				signal = SIGILL;
#1 lore raw

arch/s390/kernel/traps.c void __kprobes do_single_step(struct pt_ · line 386

Quoted 12 lines · Oleg Nesterov

Untested, but hopefully trivial enough and should't change the compiled code.

Nobody except ptrace itself should use task->ptrace or PT_PTRACED directly, change arch/s390/kernel/traps.c to use the helper.

arch/s390/kernel/traps.c renamed from arch/s390/kernel/traps.c~S390_DONT_ABUSE_PT_PTRACED +1 -1
-	if ((current->ptrace & PT_PTRACED) != 0)
+	if (tracehook_consider_fatal_signal(current, SIGTRAP))
 		force_sig(SIGTRAP, current);

Thanks, applied. Even though I'm wondering why tracehook_consider_fatal_signal has a signal parameter and doesn't do anything with it.
Is that something that will change with utrace?

#2 lore raw
Quoted 3 lines

Thanks, applied. Even though I'm wondering why tracehook_consider_fatal_signal has a signal parameter and doesn't do anything with it.
Is that something that will change with utrace?

It doesn't change with utrace of today. But it gives enough information for future tracing implementations to change that logic without rejiggering all the arch code.

Thanks,
Roland