Skip to content

Commit

Permalink
exec: Move cleanup of posix timers on exec out of de_thread
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric W. Biederman committed Mar 25, 2020
1 parent 0216915 commit 153ffb6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions fs/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1189,11 +1189,6 @@ static int de_thread(struct task_struct *tsk)
/* 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;

Expand Down Expand Up @@ -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.
*/
Expand Down

0 comments on commit 153ffb6

Please sign in to comment.