mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] do_SAK: Don't depenend on session ID 0.
@ 2006-01-29  6:29 Eric W. Biederman
  0 siblings, 0 replies; only message in thread
From: Eric W. Biederman @ 2006-01-29  6:29 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel


I'm not really certain what the thinking was but the code
obviously wanted to walk processes other than just those
in it's session, for purposes of do_SAK.  Just walking
those tasks that don't have a session assigned sounds
at the very least incomplete.

So modify the code to kill everything in the session and
anything else that might have the tty open.  Hopefully this
helps if the do_SAK functionality is ever finished.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>


---

 drivers/char/tty_io.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

c626a6c60e5a95476660e5ea87f4b912e2f3a784
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index eb8b5be..da9ed47 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2654,7 +2654,7 @@ static void __do_SAK(void *arg)
 	tty_hangup(tty);
 #else
 	struct tty_struct *tty = arg;
-	struct task_struct *p;
+	struct task_struct *g, *p;
 	int session;
 	int		i;
 	struct file	*filp;
@@ -2675,8 +2675,18 @@ static void __do_SAK(void *arg)
 		tty->driver->flush_buffer(tty);
 	
 	read_lock(&tasklist_lock);
+	/* Kill the entire session */
 	do_each_task_pid(session, PIDTYPE_SID, p) {
-		if (p->signal->tty == tty || session > 0) {
+		printk(KERN_NOTICE "SAK: killed process %d"
+			" (%s): p->signal->session==tty->session\n",
+			p->pid, p->comm);
+		send_sig(SIGKILL, p, 1);
+	} while_each_task_pid(session, PIDTYPE_SID, p);
+	/* 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): p->signal->session==tty->session\n",
 			    p->pid, p->comm);
@@ -2703,7 +2713,7 @@ static void __do_SAK(void *arg)
 			rcu_read_unlock();
 		}
 		task_unlock(p);
-	} while_each_task_pid(session, PIDTYPE_SID, p);
+	} while_each_thread(g, p);
 	read_unlock(&tasklist_lock);
 #endif
 }
-- 
1.1.5.g3480


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2006-01-29  6:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-29  6:29 [PATCH] do_SAK: Don't depenend on session ID 0 Eric W. Biederman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®