Commit 153ffb6b authored by Eric W. Biederman's avatar Eric W. Biederman

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: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 02169155
...@@ -1189,11 +1189,6 @@ static int de_thread(struct task_struct *tsk) ...@@ -1189,11 +1189,6 @@ static int de_thread(struct task_struct *tsk)
/* we have changed execution domain */ /* we have changed execution domain */
tsk->exit_signal = SIGCHLD; tsk->exit_signal = SIGCHLD;
#ifdef CONFIG_POSIX_TIMERS
exit_itimers(sig);
flush_itimer_signals();
#endif
BUG_ON(!thread_group_leader(tsk)); BUG_ON(!thread_group_leader(tsk));
return 0; return 0;
...@@ -1277,6 +1272,11 @@ int flush_old_exec(struct linux_binprm * bprm) ...@@ -1277,6 +1272,11 @@ int flush_old_exec(struct linux_binprm * bprm)
if (retval) if (retval)
goto out; goto out;
#ifdef CONFIG_POSIX_TIMERS
exit_itimers(me->signal);
flush_itimer_signals();
#endif
/* /*
* Make the signal table private. * Make the signal table private.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment