aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 12:50:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 12:50:38 -0400
commit0a6d2fac615972142715d736289abeeb7382e81d (patch)
tree828bd68949a5d4dd3a958c2be215695170b9b29c /security
parent76f8bef0db031f03bf286c8bbccfaf83f0b22224 (diff)
parent37dd0bd04a3240d2922786d501e2f12cec858fbf (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: SELinux: properly handle empty tty_files list
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 3e3fde7c1d2b..f85597a4d733 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2126,14 +2126,16 @@ static inline void flush_unauthorized_files(struct files_struct *files)
2126 tty = get_current_tty(); 2126 tty = get_current_tty();
2127 if (tty) { 2127 if (tty) {
2128 file_list_lock(); 2128 file_list_lock();
2129 file = list_entry(tty->tty_files.next, typeof(*file), f_u.fu_list); 2129 if (!list_empty(&tty->tty_files)) {
2130 if (file) { 2130 struct inode *inode;
2131
2131 /* Revalidate access to controlling tty. 2132 /* Revalidate access to controlling tty.
2132 Use inode_has_perm on the tty inode directly rather 2133 Use inode_has_perm on the tty inode directly rather
2133 than using file_has_perm, as this particular open 2134 than using file_has_perm, as this particular open
2134 file may belong to another process and we are only 2135 file may belong to another process and we are only
2135 interested in the inode-based check here. */ 2136 interested in the inode-based check here. */
2136 struct inode *inode = file->f_path.dentry->d_inode; 2137 file = list_first_entry(&tty->tty_files, struct file, f_u.fu_list);
2138 inode = file->f_path.dentry->d_inode;
2137 if (inode_has_perm(current, inode, 2139 if (inode_has_perm(current, inode,
2138 FILE__READ | FILE__WRITE, NULL)) { 2140 FILE__READ | FILE__WRITE, NULL)) {
2139 drop_tty = 1; 2141 drop_tty = 1;