aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 09:24:04 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-13 13:31:09 -0700
commit3aba3fa070fc0f38de2d41252aee9ff17d2de984 (patch)
tree6b349e4360e8079cb8e6317f025c81601311e6a5
parent52423b90e1f5b1bdbbcc6e32f4d37ada29b790c4 (diff)
downloadlinux-2.6.34-ux500-3aba3fa070fc0f38de2d41252aee9ff17d2de984.tar.gz
mm: fix missing page table unmap for stack guard page failure case
commit 5528f9132cf65d4d892bcbc5684c61e7822b21e9 upstream. .. which didn't show up in my tests because it's a no-op on x86-64 and most other architectures. But we enter the function with the last-level page table mapped, and should unmap it at exit. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--mm/memory.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c
index c43447382fe..aaaedbd2080 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2792,8 +2792,10 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
spinlock_t *ptl;
pte_t entry;
- if (check_stack_guard_page(vma, address) < 0)
+ if (check_stack_guard_page(vma, address) < 0) {
+ pte_unmap(page_table);
return VM_FAULT_SIGBUS;
+ }
if (!(flags & FAULT_FLAG_WRITE)) {
entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),