aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/exec.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 156f56acfe8e..5688b5e1b937 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1339,15 +1339,10 @@ void setup_new_exec(struct linux_binprm * bprm)
1339 * avoid bad behavior from the prior rlimits. This has to 1339 * avoid bad behavior from the prior rlimits. This has to
1340 * happen before arch_pick_mmap_layout(), which examines 1340 * happen before arch_pick_mmap_layout(), which examines
1341 * RLIMIT_STACK, but after the point of no return to avoid 1341 * RLIMIT_STACK, but after the point of no return to avoid
1342 * races from other threads changing the limits. This also 1342 * needing to clean up the change on failure.
1343 * must be protected from races with prlimit() calls.
1344 */ 1343 */
1345 task_lock(current->group_leader);
1346 if (current->signal->rlim[RLIMIT_STACK].rlim_cur > _STK_LIM) 1344 if (current->signal->rlim[RLIMIT_STACK].rlim_cur > _STK_LIM)
1347 current->signal->rlim[RLIMIT_STACK].rlim_cur = _STK_LIM; 1345 current->signal->rlim[RLIMIT_STACK].rlim_cur = _STK_LIM;
1348 if (current->signal->rlim[RLIMIT_STACK].rlim_max > _STK_LIM)
1349 current->signal->rlim[RLIMIT_STACK].rlim_max = _STK_LIM;
1350 task_unlock(current->group_leader);
1351 } 1346 }
1352 1347
1353 arch_pick_mmap_layout(current->mm); 1348 arch_pick_mmap_layout(current->mm);