Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b42bb75 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Convert SAK messages to tty_notice() 



Use tty_notice() for unified message format from the tty core.
Fix each message to accurately reflect the cause of each termination.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 339f36ba

drivers/tty/tty_io.c

+8 −12
Original line number Diff line number Diff line
@@ -3026,18 +3026,15 @@ void __do_SAK(struct tty_struct *tty) 
	read_lock(&tasklist_lock);

	/* Kill the entire session */

	do_each_pid_task(session, PIDTYPE_SID, p) {

		printk(KERN_NOTICE "SAK: killed process %d"

			" (%s): task_session(p)==tty->session\n",

		tty_notice(tty, "SAK: killed process %d (%s): by session\n",

			   task_pid_nr(p), p->comm);

		send_sig(SIGKILL, p, 1);

	} while_each_pid_task(session, PIDTYPE_SID, p);

	/* Now kill any processes that happen to have the

	 * tty open.

	 */



	/* Now kill any processes that happen to have the tty open */

	do_each_thread(g, p) {

		if (p->signal->tty == tty) {

			printk(KERN_NOTICE "SAK: killed process %d"

			    " (%s): task_session(p)==tty->session\n",

			tty_notice(tty, "SAK: killed process %d (%s): by controlling tty\n",

				   task_pid_nr(p), p->comm);

			send_sig(SIGKILL, p, 1);

			continue;
@@ -3045,8 +3042,7 @@ void __do_SAK(struct tty_struct *tty) 
		task_lock(p);

		i = iterate_fd(p->files, 0, this_tty, tty);

		if (i != 0) {

			printk(KERN_NOTICE "SAK: killed process %d"

			    " (%s): fd#%d opened to the tty\n",

			tty_notice(tty, "SAK: killed process %d (%s): by fd#%d\n",

				   task_pid_nr(p), p->comm, i - 1);

			force_sig(SIGKILL, p);

		}