patch-2.2.0-pre6 linux/arch/i386/kernel/ptrace.c

• Lines: 46
• Date: Fri Jan 8 10:21:10 1999
• Orig file: v2.2.0-pre5/linux/arch/i386/kernel/ptrace.c
• Orig date: Thu Jan 7 15:11:35 1999

diff -u --recursive --new-file v2.2.0-pre5/linux/arch/i386/kernel/ptrace.c linux/arch/i386/kernel/ptrace.c
@@ -70,7 +70,7 @@
 extern int _stext, _etext;
 static void print_child_state(struct task_struct *task)
 {
-	unsigned int * stack = (unsigned int *) task->tss.esp0;
+	unsigned int * stack = (unsigned int *) task->tss.esp;
 	int count = 40;
 
 	printk("Process: %s (stack=%p, task=%p)\n", task->comm, stack, task);
@@ -78,7 +78,7 @@
 		unsigned int data;
 		if ((unsigned int) stack < (unsigned int) task)
 			break;
-		if ((unsigned int) stack >= PAGE_SIZE + (unsigned int) task)
+		if ((unsigned int) stack >= 2*PAGE_SIZE + (unsigned int) task)
 			break;
 		data = *stack;
 		stack++;
@@ -394,15 +394,16 @@
 		ret = 0;
 		goto out;
 	}
-	if (pid == 1)		/* you may not mess with init */
-		goto out;
 	ret = -ESRCH;
 	read_lock(&tasklist_lock);
 	child = find_task_by_pid(pid);
 	read_unlock(&tasklist_lock);	/* FIXME!!! */
 	if (!child)
 		goto out;
+print_child_state(child);
 	ret = -EPERM;
+	if (pid == 1)		/* you may not mess with init */
+		goto out;
 	if (request == PTRACE_ATTACH) {
 		if (child == current)
 			goto out;
@@ -435,8 +436,6 @@
 	if (!(child->flags & PF_PTRACED))
 		goto out;
 	if (child->state != TASK_STOPPED) {
-print_child_state(child);
-goto out;
 		if (request != PTRACE_KILL)
 			goto out;
 	}