From: Hugh Dickins Date: Thu, 16 Apr 2009 21:45:05 +0000 (+0000) Subject: mm: pass correct mm when growing stack X-Git-Tag: v2.6.29.2~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14be1689c96842bd93cbcda4cb0bd4c5cc15a5a0;p=thirdparty%2Fkernel%2Fstable.git mm: pass correct mm when growing stack upstream commit: 05fa199d45c54a9bda7aa3ae6537253d6f097aa9 Tetsuo Handa reports seeing the WARN_ON(current->mm == NULL) in security_vm_enough_memory(), when do_execve() is touching the target mm's stack, to set up its args and environment. Yes, a UMH_NO_WAIT or UMH_WAIT_PROC call_usermodehelper() spawns an mm-less kernel thread to do the exec. And in any case, that vm_enough_memory check when growing stack ought to be done on the target mm, not on the execer's mm (though apart from the warning, it only makes a slight tweak to OVERCOMMIT_NEVER behaviour). Reported-by: Tetsuo Handa Signed-off-by: Hugh Dickins Cc: stable@kernel.org Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright --- diff --git a/mm/mmap.c b/mm/mmap.c index 00ced3ee49a8c..f1aa6f92bc8ae 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1571,7 +1571,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns * Overcommit.. This must be the final test, as it will * update security statistics. */ - if (security_vm_enough_memory(grow)) + if (security_vm_enough_memory_mm(mm, grow)) return -ENOMEM; /* Ok, everything looks good - let it rip */