Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 779f4e1c authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

Revert "exec: avoid RLIMIT_STACK races with prlimit()" 



This reverts commit 04e35f44.

SELinux runs with secureexec for all non-"noatsecure" domain transitions,
which means lots of processes end up hitting the stack hard-limit change
that was introduced in order to fix a race with prlimit(). That race fix
will need to be redesigned.

Reported-by: default avatarLaura Abbott <labbott@redhat.com>
Reported-by: default avatarTomáš Trnka <trnka@scm.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f8940a0f

fs/exec.c

+1 −6
Original line number Diff line number Diff line
@@ -1339,15 +1339,10 @@ void setup_new_exec(struct linux_binprm * bprm) 
		 * 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

		 * races from other threads changing the limits. This also

		 * must be protected from races with prlimit() calls.

		 * needing to clean up the change on failure.

		 */

		task_lock(current->group_leader);

		if (current->signal->rlim[RLIMIT_STACK].rlim_cur > _STK_LIM)

			current->signal->rlim[RLIMIT_STACK].rlim_cur = _STK_LIM;

		if (current->signal->rlim[RLIMIT_STACK].rlim_max > _STK_LIM)

			current->signal->rlim[RLIMIT_STACK].rlim_max = _STK_LIM;

		task_unlock(current->group_leader);

	}



	arch_pick_mmap_layout(current->mm);