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>
This commit is contained in:
parent
0216915592
commit
153ffb6ba4
10
fs/exec.c
10
fs/exec.c
|
@ -1189,11 +1189,6 @@ no_thread_group:
|
||||||
/* 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)
|
||||||
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.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue