diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-17 21:27:48 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-06-17 21:27:48 -0400 |
| commit | e0e58cd769d3f4c21e11a9cea2e5bb062cfc1a38 (patch) | |
| tree | b0e5f98af59353620995144bbc7dc136f2cf6635 /fs/exec.c | |
| parent | 00c598e6531a910503bcb7702dda0c56925c4c95 (diff) | |
| parent | fe7b2904b463580694c3706475f173d66e3fcb26 (diff) | |
| download | linux-rt-e0e58cd769d3f4c21e11a9cea2e5bb062cfc1a38.tar.gz | |
Merge tag 'v3.12.22' into v3.12-rt
This is the 3.12.22 stable release
Conflicts:
kernel/irq/manage.c
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c index eb02518a98b3..ff5fa50de3ca 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -657,10 +657,10 @@ int setup_arg_pages(struct linux_binprm *bprm, unsigned long rlim_stack; #ifdef CONFIG_STACK_GROWSUP - /* Limit stack size to 1GB */ + /* Limit stack size */ stack_base = rlimit_max(RLIMIT_STACK); - if (stack_base > (1 << 30)) - stack_base = 1 << 30; + if (stack_base > STACK_SIZE_MAX) + stack_base = STACK_SIZE_MAX; /* Make sure we didn't let the argument array grow too large. */ if (vma->vm_end - vma->vm_start > stack_base) |