1 files changed, 7 insertions, 4 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 44e9cd470543..f5df8c70a9b5 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1695,9 +1695,10 @@ static inline void flush_unauthorized_files(struct files_struct * files)
         struct tty_struct *tty;
         struct fdtable *fdt;
         long j = -1;
+        int drop_tty = 0;
 
         mutex_lock(&tty_mutex);
-        tty = current->signal->tty;
+        tty = get_current_tty();
         if (tty) {
                 file_list_lock();
                 file = list_entry(tty->tty_files.next, typeof(*file), f_u.fu_list);
@@ -1710,12 +1711,14 @@ static inline void flush_unauthorized_files(struct files_struct * files)
                         struct inode *inode = file->f_dentry->d_inode;
                         if (inode_has_perm(current, inode,
                                            FILE__READ | FILE__WRITE, NULL)) {
-                                /* Reset controlling tty. */
-                                current->signal->tty = NULL;
-                                current->signal->tty_old_pgrp = 0;
+                                drop_tty = 1;
                         }
                 }
                 file_list_unlock();
+
+                /* Reset controlling tty. */
+                if (drop_tty)
+                        proc_set_tty(current, NULL);
         }
         mutex_unlock(&tty_mutex);