summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-28 17:32:35 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-28 17:32:35 -0800
commit691ce26e4066147ab75366307c5c65d26c7fd805 (patch)
treeb8123daa92c4fa8529a9cba2d61742b7387942d8
parent707badb80b90d15d97f46155e6af432bd52789a3 (diff)
parentfc5d81e69d15c65ca20d9e5b4e242690e3e9c27d (diff)
downloadkernel-crypto-691ce26e4066147ab75366307c5c65d26c7fd805.tar.gz
kernel-crypto-691ce26e4066147ab75366307c5c65d26c7fd805.tar.xz
kernel-crypto-691ce26e4066147ab75366307c5c65d26c7fd805.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: selinux: fix dentry_open() error check
-rw-r--r--security/selinux/hooks.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 8ab5679a37a..28ee187ed22 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1754,7 +1754,8 @@ static inline void flush_unauthorized_files(struct files_struct * files)
get_file(devnull);
} else {
devnull = dentry_open(dget(selinux_null), mntget(selinuxfs_mount), O_RDWR);
- if (!devnull) {
+ if (IS_ERR(devnull)) {
+ devnull = NULL;
put_unused_fd(fd);
fput(file);
continue;