[PATCH] Don't allow the stack to grow into hugetlb reserved regions

When expanding the stack, we don't currently check if the VMA will cross
into an area of the address space that is reserved for hugetlb pages.
Subsequent faults on the expanded portion of such a VMA will confuse the
low-level MMU code, resulting in an OOPS. Check for this.

Signed-off-by: Adam Litke <agl@us.ibm.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Adam Litke and committed by Linus Torvalds 0d59a01b bcdddfb6

+7
+7
mm/mmap.c
··· 1477 1477 { 1478 1478 struct mm_struct *mm = vma->vm_mm; 1479 1479 struct rlimit *rlim = current->signal->rlim; 1480 + unsigned long new_start; 1480 1481 1481 1482 /* address space limit tests */ 1482 1483 if (!may_expand_vm(mm, grow)) ··· 1496 1495 if (locked > limit && !capable(CAP_IPC_LOCK)) 1497 1496 return -ENOMEM; 1498 1497 } 1498 + 1499 + /* Check to ensure the stack will not grow into a hugetlb-only region */ 1500 + new_start = (vma->vm_flags & VM_GROWSUP) ? vma->vm_start : 1501 + vma->vm_end - size; 1502 + if (is_hugepage_only_range(vma->vm_mm, new_start, size)) 1503 + return -EFAULT; 1499 1504 1500 1505 /* 1501 1506 * Overcommit.. This must be the final test, as it will