patch-1.3.48 linux/arch/mips/kernel/ptrace.c

• Lines: 30
• Date: Wed Dec 13 12:39:44 1995
• Orig file: v1.3.47/linux/arch/mips/kernel/ptrace.c
• Orig date: Thu Sep 7 17:17:16 1995

diff -u --recursive --new-file v1.3.47/linux/arch/mips/kernel/ptrace.c linux/arch/mips/kernel/ptrace.c
@@ -11,6 +11,7 @@
 #include <linux/user.h>
 
 #include <asm/segment.h>
+#include <asm/pgtable.h>
 #include <asm/system.h>
 
 #if 0
@@ -150,10 +151,8 @@
 		goto repeat;
 	}
 /* this is a hack for non-kernel-mapped video buffers and similar */
-	if (page < high_memory) {
-		page += addr & ~PAGE_MASK;
-		*(unsigned long *) page = data;
-	}
+	if (page < high_memory)
+		*(unsigned long *) (page + (addr & ~PAGE_MASK)) = data;
 /* we're bypassing pagetables, so we have to set the dirty bit ourselves */
 /* this should also re-instate whatever read-only mode there was before */
 	set_pte(pgtable, pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
@@ -463,6 +462,8 @@
 		case PTRACE_KILL: {
 			long tmp;
 
+			if (child->state == TASK_ZOMBIE)	/* already dead */
+				return 0;
 			wake_up_process(child);
 			child->exit_code = SIGKILL;
 	/* make sure the single step bit is not set. */