3 files changed, 19 insertions, 9 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 39db186d5c5b..5d405a1bfbe3 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -154,6 +154,7 @@ int tty_ioctl(struct inode * inode, struct file * file,
 static int tty_fasync(int fd, struct file * filp, int on);
 static void release_tty(struct tty_struct *tty, int idx);
 static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
 
 /**
  *      alloc_tty_struct        -       allocate a tty object
@@ -1558,6 +1559,18 @@ void disassociate_ctty(int on_exit)
         unlock_kernel();
 }
 
+/**
+ *
+ *      no_tty  - Ensure the current process does not have a controlling tty
+ */
+void no_tty(void)
+{
+        struct task_struct *tsk = current;
+        if (tsk->signal->leader)
+                disassociate_ctty(0);
+        proc_clear_tty(tsk);
+}
+
 
 /**
  *      stop_tty        -       propogate flow control
@@ -3280,9 +3293,7 @@ int tty_ioctl(struct inode * inode, struct file * file,
                 case TIOCNOTTY:
                         if (current->signal->tty != tty)
                                 return -ENOTTY;
-                        if (current->signal->leader)
-                                disassociate_ctty(0);
-                        proc_clear_tty(current);
+                        no_tty();
                         return 0;
                 case TIOCSCTTY:
                         return tiocsctty(tty, arg);
@@ -3844,7 +3855,7 @@ static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
         tsk->signal->tty_old_pgrp = NULL;
 }
 
-void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
+static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
 {
         spin_lock_irq(&tsk->sighand->siglock);
         __proc_set_tty(tsk, tty);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index dee72b9a20fb..bb4576085203 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -313,6 +313,7 @@ extern int tty_hung_up_p(struct file * filp);
 extern void do_SAK(struct tty_struct *tty);
 extern void __do_SAK(struct tty_struct *tty);
 extern void disassociate_ctty(int priv);
+extern void no_tty(void);
 extern void tty_flip_buffer_push(struct tty_struct *tty);
 extern speed_t tty_get_baud_rate(struct tty_struct *tty);
 extern speed_t tty_termios_baud_rate(struct ktermios *termios);
@@ -333,7 +334,6 @@ extern int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
 extern dev_t tty_devnum(struct tty_struct *tty);
 extern void proc_clear_tty(struct task_struct *p);
-extern void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
 extern struct tty_struct *get_current_tty(void);
 
 extern struct mutex tty_mutex;
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 885a9a958b8d..fa9dbb6b110d 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1758,12 +1758,11 @@ static inline void flush_unauthorized_files(struct files_struct * files)
                         }
                 }
                 file_list_unlock();
-
-                /* Reset controlling tty. */
-                if (drop_tty)
-                        proc_set_tty(current, NULL);
         }
         mutex_unlock(&tty_mutex);
+        /* Reset controlling tty. */
+        if (drop_tty)
+                no_tty();
 
         /* Revalidate access to inherited open files. */