This reverts commit 20ac94378de5. send_sig() does not take tasklist_lock for a long time, so this commit and the problem it solves are not relevant anymore.
Also, the problem of force_sig() is it clears SIGNAL_UNKILLABLE flag, thus even global init may be killed by __do_SAK(), which is definitely not the expected behavior. Came from discussion in "tty: Iterate only thread group leaders in __do_SAK()" https://lkml.org/lkml/2018/1/11/492 Suggested-by: Oleg Nesterov <o...@redhat.com> Signed-off-by: Kirill Tkhai <ktk...@virtuozzo.com> --- drivers/tty/tty_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index dc60aeea87d8..84715ba1aee2 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2737,7 +2737,7 @@ void __do_SAK(struct tty_struct *tty) if (i != 0) { tty_notice(tty, "SAK: killed process %d (%s): by fd#%d\n", task_pid_nr(p), p->comm, i - 1); - force_sig(SIGKILL, p); + send_sig(SIGKILL, p, 1); } task_unlock(p); } while_each_thread(g, p);
