path: root/fs
diff options
authorMichael Neuling <>2010-02-22 12:44:24 -0800
committerLinus Torvalds <>2010-02-22 19:50:34 -0800
commita17e18790a8c47113a73139d54a375dc9ccd8f08 (patch)
tree2f85b0265e004826d76614f27c133063499b855e /fs
parent89f3f2199084a160a3a45fa6d9af235696321758 (diff)
fs/exec.c: fix initial stack reservation
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 <> Reviewed-by: KOSAKI Motohiro <> Acked-by: WANG Cong <> Cc: Anton Blanchard <> Cc: Oleg Nesterov <> Cc: James Morris <> Cc: Serge Hallyn <> Cc: Benjamin Herrenschmidt <> Cc: Jouni Malinen <> Cc: <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'fs')
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c
index e95c692ef0e..cce6bbdbdbb 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -637,7 +637,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
* will align it up.
rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK;
- rlim_stack = min(rlim_stack, stack_size);
if (stack_size + stack_expand > rlim_stack)
stack_base = vma->vm_start + rlim_stack;