From: Eric W. Biederman <ebiederm@xmission.com>
Date: Wed, 25 Mar 2020 15:00:38 +0000 (-0500)
Subject: exec: Move cleanup of posix timers on exec out of de_thread
X-Git-Tag: v5.7-rc1~129^2~1^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=153ffb6ba49fd80dc607a9f230415af02b728d70;p=thirdparty%2Fkernel%2Flinux.git

exec: Move cleanup of posix timers on exec out of de_thread

These functions have very little to do with de_thread move them out
of de_thread an into flush_old_exec proper so it can be more clearly
seen what flush_old_exec is doing.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
---

diff --git a/fs/exec.c b/fs/exec.c
index ff74b9a74d340..215d86f77b63f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1189,11 +1189,6 @@ no_thread_group:
 	/* we have changed execution domain */
 	tsk->exit_signal = SIGCHLD;
 
-#ifdef CONFIG_POSIX_TIMERS
-	exit_itimers(sig);
-	flush_itimer_signals();
-#endif
-
 	BUG_ON(!thread_group_leader(tsk));
 	return 0;
 
@@ -1277,6 +1272,11 @@ int flush_old_exec(struct linux_binprm * bprm)
 	if (retval)
 		goto out;
 
+#ifdef CONFIG_POSIX_TIMERS
+	exit_itimers(me->signal);
+	flush_itimer_signals();
+#endif
+
 	/*
 	 * Make the signal table private.
 	 */