summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-10-13 10:40:43 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 09:51:41 -0700
commit934e6ebf96e8c1a0f299e64129fdaebc1132a427 (patch)
treeab4bd754997b097f06a5cfefd9e3671d56e628f4 /security
parent2cb5998b5f0ccc886fdda3509059eef297b49577 (diff)
downloadlinux-3.10-934e6ebf96e8c1a0f299e64129fdaebc1132a427.tar.gz
linux-3.10-934e6ebf96e8c1a0f299e64129fdaebc1132a427.tar.bz2
linux-3.10-934e6ebf96e8c1a0f299e64129fdaebc1132a427.zip
tty: Redo current tty locking
Currently it is sometimes locked by the tty mutex and sometimes by the sighand lock. The latter is in fact correct and now we can hand back referenced objects we can fix this up without problems around sleeping functions. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 089d61a2395..48881394fbd 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2121,9 +2121,7 @@ static inline void flush_unauthorized_files(struct files_struct *files)
long j = -1;
int drop_tty = 0;
- mutex_lock(&tty_mutex);
tty = get_current_tty();
- mutex_unlock(&tty_mutex);
if (tty) {
file_list_lock();
file = list_entry(tty->tty_files.next, typeof(*file), f_u.fu_list);