Home Home > GIT Browse
summaryrefslogtreecommitdiff
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:27:39 -0700
commit5eafdadb782787f9ae13bd0b1e5e372c5a6c28f2 (patch)
treea4913466b0acaa5c463b74f2084fb8a2e95c3d54
parentca2f90176ea230afe03deaa4b0aff0d7f60c3685 (diff)
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 5b0760feda79..daa100ff2f99 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2783,8 +2783,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),