Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix oops in revalidate when called with NULL nameidata
jimmycarry · May 12, 2011 · 6eaed0a · 6eaed0a
2 parents 8043f4e + d243390
commit 6eaed0a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
@@ -174,7 +174,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
 		if (!inode)
 			return 0;
 
-		if (nd->flags & LOOKUP_RCU)
+		if (nd && (nd->flags & LOOKUP_RCU))
 			return -ECHILD;
 
 		fc = get_fuse_conn(inode);