patch-2.1.4 linux/arch/i386/mm/fault.c

• Lines: 43
• Date: Tue Oct 15 18:08:29 1996
• Orig file: v2.1.3/linux/arch/i386/mm/fault.c
• Orig date: Thu Oct 10 19:10:54 1996

diff -u --recursive --new-file v2.1.3/linux/arch/i386/mm/fault.c linux/arch/i386/mm/fault.c
@@ -30,7 +30,7 @@
 	unsigned long start = (unsigned long) addr;
 
 	if (!size)
-		return 0;
+		return 1;
 
 	vma = find_vma(current->mm, start);
 	if (!vma)
@@ -60,7 +60,7 @@
 		if (!(vma->vm_flags & VM_WRITE))
 			goto bad_area;;
 	}
-	return 0;
+	return 1;
 
 check_stack:
 	if (!(vma->vm_flags & VM_GROWSDOWN))
@@ -69,7 +69,7 @@
 		goto good_area;
 
 bad_area:
-	return -EFAULT;
+	return 0;
 }
 
 /*
@@ -161,7 +161,14 @@
  */
 bad_area:
 	up(&mm->mmap_sem);
-	handle_exception(&tsk->tss.ex);
+	/* is there valid exception data? Return to indicated handler if so */
+	if (tsk->tss.ex.count == 0) {
+		printk("Exception at %lx (%lx)\n", regs->eip, regs->edx);
+		tsk->tss.ex.count--;
+		regs->eip = regs->edx;
+		regs->edx = -EFAULT;
+		return;
+	}
 	if (error_code & 4) {
 		tsk->tss.cr2 = address;
 		tsk->tss.error_code = error_code;