Commit de04d297 authored by Jann Horn's avatar Jann Horn Committed by Greg Kroah-Hartman

mm: enforce min addr even if capable() in expand_downwards()

commit 0a1d5299 upstream.

security_mmap_addr() does a capability check with current_cred(), but
we can reach this code from contexts like a VFS write handler where
current_cred() must not be used.

This can be abused on systems without SMAP to make NULL pointer
dereferences exploitable again.

Fixes: 8869477a ("security: protect from stack expansion into low vm addresses")
Cc: stable@kernel.org
Signed-off-by: default avatarJann Horn <jannh@google.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff86bb4d
...@@ -2391,12 +2391,11 @@ int expand_downwards(struct vm_area_struct *vma, ...@@ -2391,12 +2391,11 @@ int expand_downwards(struct vm_area_struct *vma,
{ {
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
struct vm_area_struct *prev; struct vm_area_struct *prev;
int error; int error = 0;
address &= PAGE_MASK; address &= PAGE_MASK;
error = security_mmap_addr(address); if (address < mmap_min_addr)
if (error) return -EPERM;
return error;
/* Enforce stack_guard_gap */ /* Enforce stack_guard_gap */
prev = vma->vm_prev; prev = vma->vm_prev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment