|
|
@@ -1350,6 +1350,18 @@ void setup_new_exec(struct linux_binprm * bprm)
|
|
|
*/
|
|
|
bprm->secureexec |= bprm->cap_elevated;
|
|
|
|
|
|
+ if (bprm->secureexec) {
|
|
|
+ /*
|
|
|
+ * For secureexec, reset the stack limit to sane default to
|
|
|
+ * avoid bad behavior from the prior rlimits. This has to
|
|
|
+ * happen before arch_pick_mmap_layout(), which examines
|
|
|
+ * RLIMIT_STACK, but after the point of no return to avoid
|
|
|
+ * needing to clean up the change on failure.
|
|
|
+ */
|
|
|
+ if (current->signal->rlim[RLIMIT_STACK].rlim_cur > _STK_LIM)
|
|
|
+ current->signal->rlim[RLIMIT_STACK].rlim_cur = _STK_LIM;
|
|
|
+ }
|
|
|
+
|
|
|
arch_pick_mmap_layout(current->mm);
|
|
|
|
|
|
current->sas_ss_sp = current->sas_ss_size = 0;
|