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
git-mirror · Nov 29, 2006 · 691ce26 · 691ce26
2 parents 707badb + fc5d81e
commit 691ce26
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;