---

yaml --- r: 30523 b: refs/heads/master c: 03fdc2c h: refs/heads/master i: 30521: edd3215 30519: 9f9fe4a v: v3
git-mirror · Jun 26, 2006 · 19af4c0 · 19af4c0
1 parent eb0dde0
commit 19af4c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bfa9bb5195c68f75bd3937e4d77cb0bfe852d0d
+refs/heads/master: 03fdc2c277afdbd217eccd1ce0cfeff77ebd8b77
diff --git a/trunk/arch/x86_64/mm/fault.c b/trunk/arch/x86_64/mm/fault.c
@@ -410,8 +410,10 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 	if (!(vma->vm_flags & VM_GROWSDOWN))
 		goto bad_area;
 	if (error_code & 4) {
-		// XXX: align red zone size with ABI 
-		if (address + 128 < regs->rsp)
+		/* Allow userspace just enough access below the stack pointer
+		 * to let the 'enter' instruction work.
+		 */
+		if (address + 65536 + 32 * sizeof(unsigned long) < regs->rsp)
 			goto bad_area;
 	}
 	if (expand_stack(vma, address))