Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -5
+5 -5
fs/exec.c
··· 1189 1189 /* we have changed execution domain */ 1190 1190 tsk->exit_signal = SIGCHLD; 1191 1191 1192 - #ifdef CONFIG_POSIX_TIMERS 1193 - exit_itimers(sig); 1194 - flush_itimer_signals(); 1195 - #endif 1196 - 1197 1192 BUG_ON(!thread_group_leader(tsk)); 1198 1193 return 0; 1199 1194 ··· 1271 1276 retval = de_thread(me); 1272 1277 if (retval) 1273 1278 goto out; 1279 + 1280 + #ifdef CONFIG_POSIX_TIMERS 1281 + exit_itimers(me->signal); 1282 + flush_itimer_signals(); 1283 + #endif 1274 1284 1275 1285 /* 1276 1286 * Make the signal table private.