lkml.org 
[lkml]   [2018]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [RFC][PATCH 09/11] tty_io: Use do_send_sig_info in __do_SACK to forcibly kill tasks
Oleg Nesterov <oleg@redhat.com> writes:

> On 07/10, Eric W. Biederman wrote:
>>
>> Therefore use do_send_sig_info in all cases in __do_SAK to kill
>> tasks as allows for exactly what the code wants to do.
>
> OK, but probably the changelog should also mention that now even the global
> init will be killed if it has this tty opened.

force_sig was ensuring the global init would die. So that isn't a
change. Mentioning it isn't a bad idea.

The change for global init is it will now die if init is a member of the
session or init is using this tty as it's controlling tty.

Semantically killing init with SAK is completely appropriate. As
otherwise the guarantee that nothing has the terminal open will be
present. So yes I will update the description.

Eric

>> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
>> ---
>> drivers/tty/tty_io.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
>> index cec58c53b0c4..42ac168c2a47 100644
>> --- a/drivers/tty/tty_io.c
>> +++ b/drivers/tty/tty_io.c
>> @@ -2747,7 +2747,7 @@ void __do_SAK(struct tty_struct *tty)
>> do_each_pid_task(session, PIDTYPE_SID, p) {
>> tty_notice(tty, "SAK: killed process %d (%s): by session\n",
>> task_pid_nr(p), p->comm);
>> - send_sig(SIGKILL, p, 1);
>> + do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
>> } while_each_pid_task(session, PIDTYPE_SID, p);
>>
>> /* Now kill any processes that happen to have the tty open */
>> @@ -2755,7 +2755,7 @@ void __do_SAK(struct tty_struct *tty)
>> if (p->signal->tty == tty) {
>> tty_notice(tty, "SAK: killed process %d (%s): by controlling tty\n",
>> task_pid_nr(p), p->comm);
>> - send_sig(SIGKILL, p, 1);
>> + do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
>> continue;
>> }
>> task_lock(p);
>> @@ -2763,7 +2763,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);
>> + do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
>> }
>> task_unlock(p);
>> } while_each_thread(g, p);
>> --
>> 2.17.1
>>

\
 
 \ /
  Last update: 2018-07-16 17:09    [W:0.204 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site