Re: [PATCH v2 3/5] exec: Move cleanup of posix timers on exec out of de_thread

Kees Cook
2020-03-10T20:31:22Z

On Sun, Mar 08, 2020 at 04:36:55PM -0500, Eric W. Biederman wrote:
>
> 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>
> ---
> fs/exec.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/exec.c b/fs/exec.c
> index ff74b9a74d34..215d86f77b63 100644
> --- a/fs/exec.c
> +++ b/fs/exec.c
> @@ -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;
>
> @@ -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
> +

I twitch at seeing #ifdefs in .c instead of hidden in the .h declarations
of these two functions, but as this is a copy/paste, I'll live. ;)

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> /*
> * Make the signal table private.
> */
> --
> 2.25.0
>

--
Kees Cook