Prev: [022/145] [SCSI] mpt2sas: Delete volume before HBA detach.
Next: [patch 096/123] USB: remove debugging message for uevent constructions
From: Greg KH on 12 Mar 2010 20:20
2.6.32-stable review patch. If anyone has any objections, please let me know.

----------------
From: Michael Neuling <mikey(a)neuling.org>

commit a17e18790a8c47113a73139d54a375dc9ccd8f08 upstream.

803bf5ec259941936262d10ecc84511b76a20921 ("fs/exec.c: restrict initial
stack space expansion to rlimit") attempts to limit the initial stack to
20*PAGE_SIZE. Unfortunately, in attempting ensure the stack is not
reduced in size, we ended up not changing the stack at all.

This size reduction check is not necessary as the expand_stack call does
this already.

This caused a regression in UML resulting in most guest processes being
killed.

Signed-off-by: Michael Neuling <mikey(a)neuling.org>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com>
Acked-by: WANG Cong <xiyou.wangcong(a)gmail.com>
Cc: Anton Blanchard <anton(a)samba.org>
Cc: Oleg Nesterov <oleg(a)redhat.com>
Cc: James Morris <jmorris(a)namei.org>
Cc: Serge Hallyn <serue(a)us.ibm.com>
Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org>
Cc: Jouni Malinen <j(a)w1.fi>
Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
fs/exec.c | 1 -
1 file changed, 1 deletion(-)

--- a/fs/exec.c
+++ b/fs/exec.c
@@ -638,7 +638,6 @@ int setup_arg_pages(struct linux_binprm
* will align it up.
*/
rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK;
- rlim_stack = min(rlim_stack, stack_size);
#ifdef CONFIG_STACK_GROWSUP
if (stack_size + stack_expand > rlim_stack)
stack_base = vma->vm_start + rlim_stack;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [022/145] [SCSI] mpt2sas: Delete volume before HBA detach.
Next: [patch 096/123] USB: remove debugging message for uevent constructions