diff options
| author | Luck, Tony <tony.luck@intel.com> | 2010-08-24 11:44:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-26 17:18:41 -0700 |
| commit | 0ac99e6ff81f5c4d57c2cb1b716a3cb78227740c (patch) | |
| tree | 84e9703f8155df036027f37654e1ef822e16ba06 /mm | |
| parent | 3c8b7588c8bb9609c73c49087449be991d3d45ba (diff) | |
| download | linux-stable-0ac99e6ff81f5c4d57c2cb1b716a3cb78227740c.tar.gz linux-stable-0ac99e6ff81f5c4d57c2cb1b716a3cb78227740c.tar.bz2 linux-stable-0ac99e6ff81f5c4d57c2cb1b716a3cb78227740c.zip | |
guard page for stacks that grow upwards
commit 8ca3eb08097f6839b2206e2242db4179aee3cfb3 upstream.
pa-risc and ia64 have stacks that grow upwards. Check that
they do not run into other mappings. By making VM_GROWSUP
0x0 on architectures that do not ever use it, we can avoid
some unpleasant #ifdefs in check_stack_guard_page().
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: dann frazier <dannf@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory.c | 15 | ||||
| -rw-r--r-- | mm/mmap.c | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/mm/memory.c b/mm/memory.c index 93da8f1338c4..7550758d26f8 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2791,11 +2791,9 @@ out_release: } /* - * This is like a special single-page "expand_downwards()", - * except we must first make sure that 'address-PAGE_SIZE' + * This is like a special single-page "expand_{down|up}wards()", + * except we must first make sure that 'address{-|+}PAGE_SIZE' * doesn't hit another vma. - * - * The "find_vma()" will do the right thing even if we wrap */ static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address) { @@ -2814,6 +2812,15 @@ static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned lo expand_stack(vma, address - PAGE_SIZE); } + if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) { + struct vm_area_struct *next = vma->vm_next; + + /* As VM_GROWSDOWN but s/below/above/ */ + if (next && next->vm_start == address + PAGE_SIZE) + return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM; + + expand_upwards(vma, address + PAGE_SIZE); + } return 0; } diff --git a/mm/mmap.c b/mm/mmap.c index 12d38bf4f5b0..3a943622bd9a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1704,9 +1704,6 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns * PA-RISC uses this for its stack; IA64 for its Register Backing Store. * vma is the last one with address > vma->vm_end. Have to extend vma. */ -#ifndef CONFIG_IA64 -static -#endif int expand_upwards(struct vm_area_struct *vma, unsigned long address) { int error; |