From: "Eric W. Biederman" <ebiederm@xmission.com>

This keeps the wrong process from being notified if the daemon to spawn a new
console dies.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/keyboard.c |    9 ++++++---
 drivers/char/vt_ioctl.c |    5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff -puN drivers/char/keyboard.c~vt-update-spawnpid-to-be-a-struct-pid_t drivers/char/keyboard.c
--- a/drivers/char/keyboard.c~vt-update-spawnpid-to-be-a-struct-pid_t
+++ a/drivers/char/keyboard.c
@@ -108,7 +108,8 @@ const int NR_TYPES = ARRAY_SIZE(max_vals
 struct kbd_struct kbd_table[MAX_NR_CONSOLES];
 static struct kbd_struct *kbd = kbd_table;
 
-int spawnpid, spawnsig;
+struct pid *spawnpid;
+int spawnsig;
 
 /*
  * Variables exported for vt.c
@@ -579,8 +580,10 @@ static void fn_compose(struct vc_data *v
 static void fn_spawn_con(struct vc_data *vc, struct pt_regs *regs)
 {
 	if (spawnpid)
-		if (kill_proc(spawnpid, spawnsig, 1))
-			spawnpid = 0;
+		if (kill_pid(spawnpid, spawnsig, 1)) {
+			put_pid(spawnpid);
+			spawnpid = NULL;
+		}
 }
 
 static void fn_SAK(struct vc_data *vc, struct pt_regs *regs)
diff -puN drivers/char/vt_ioctl.c~vt-update-spawnpid-to-be-a-struct-pid_t drivers/char/vt_ioctl.c
--- a/drivers/char/vt_ioctl.c~vt-update-spawnpid-to-be-a-struct-pid_t
+++ a/drivers/char/vt_ioctl.c
@@ -645,12 +645,13 @@ int vt_ioctl(struct tty_struct *tty, str
 	 */
 	case KDSIGACCEPT:
 	{
-		extern int spawnpid, spawnsig;
+		struct pid *spawnpid;
+		extern int spawnsig;
 		if (!perm || !capable(CAP_KILL))
 		  return -EPERM;
 		if (!valid_signal(arg) || arg < 1 || arg == SIGKILL)
 		  return -EINVAL;
-		spawnpid = current->pid;
+		spawnpid = get_pid(task_pid(current));
 		spawnsig = arg;
 		return 0;
 	}
_