Commit b20c8122 authored by Stephen Smalley's avatar Stephen Smalley Committed by Linus Torvalds

[PATCH] selinux: fix tty locking

Take tty_mutex when accessing ->signal->tty in selinux code.  Noted by Alan
Cox.  Longer term, we are looking at refactoring the code to provide better
encapsulation of the tty layer, but this is a simple fix that addresses the
immediate bug.
Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bc7e982b
...@@ -1689,10 +1689,12 @@ static inline void flush_unauthorized_files(struct files_struct * files) ...@@ -1689,10 +1689,12 @@ static inline void flush_unauthorized_files(struct files_struct * files)
{ {
struct avc_audit_data ad; struct avc_audit_data ad;
struct file *file, *devnull = NULL; struct file *file, *devnull = NULL;
struct tty_struct *tty = current->signal->tty; struct tty_struct *tty;
struct fdtable *fdt; struct fdtable *fdt;
long j = -1; long j = -1;
mutex_lock(&tty_mutex);
tty = current->signal->tty;
if (tty) { if (tty) {
file_list_lock(); file_list_lock();
file = list_entry(tty->tty_files.next, typeof(*file), f_u.fu_list); file = list_entry(tty->tty_files.next, typeof(*file), f_u.fu_list);
...@@ -1712,6 +1714,7 @@ static inline void flush_unauthorized_files(struct files_struct * files) ...@@ -1712,6 +1714,7 @@ static inline void flush_unauthorized_files(struct files_struct * files)
} }
file_list_unlock(); file_list_unlock();
} }
mutex_unlock(&tty_mutex);
/* Revalidate access to inherited open files. */ /* Revalidate access to inherited open files. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment