diff options
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 1 |
1 files changed, 0 insertions, 1 deletions
| @@ -637,7 +637,6 @@ int setup_arg_pages(struct linux_binprm *bprm, | |||
| 637 | * will align it up. | 637 | * will align it up. |
| 638 | */ | 638 | */ |
| 639 | rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK; | 639 | rlim_stack = rlimit(RLIMIT_STACK) & PAGE_MASK; |
| 640 | rlim_stack = min(rlim_stack, stack_size); | ||
| 641 | #ifdef CONFIG_STACK_GROWSUP | 640 | #ifdef CONFIG_STACK_GROWSUP |
| 642 | if (stack_size + stack_expand > rlim_stack) | 641 | if (stack_size + stack_expand > rlim_stack) |
| 643 | stack_base = vma->vm_start + rlim_stack; | 642 | stack_base = vma->vm_start + rlim_stack; |
