From: Eric W. Biederman <ebiederm@xmission.com>
Date: Thu, 13 Apr 2006 10:49:07 +0000 (-0600)
Subject: [PATCH] do_SAK: Don't recursively take the tasklist_lock
X-Git-Tag: v2.6.17-rc2~78
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20ac94378de59d61dc39f10ed5530485e4ac8c07;p=linux-2.6

[PATCH] do_SAK: Don't recursively take the tasklist_lock

By calling send_sig do_SAK is recursively taking the
tasklist_lock, which is silly.

In addition I just audited the kernel and this was the only
place where tasklist_lock is taken inside of task_lock.

So this one line change is a general worthwhile cleanup and
it increases our options on how to fix the ptrace_attach races.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index f70a47eadb..841f0bd3ea 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2734,7 +2734,7 @@ static void __do_SAK(void *arg)
 					printk(KERN_NOTICE "SAK: killed process %d"
 					    " (%s): fd#%d opened to the tty\n",
 					    p->pid, p->comm, i);
-					send_sig(SIGKILL, p, 1);
+					force_sig(SIGKILL, p);
 					break;
 				}
 			}