diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 11:06:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 11:06:53 -0400 |
| commit | 6eaed0a438ef554a282210a04da0de27b671d817 (patch) | |
| tree | d0caf299ebcdac32fad8ab1baa7957e44655d1eb | |
| parent | 8043f4eb85bf772e3af82678657019937388b6e1 (diff) | |
| parent | d24339059d640f108c08ba99ef30e3bafa10f8e4 (diff) | |
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
| -rw-r--r-- | fs/fuse/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index c6ba49bd95b3..b32eb29a4e6f 100644 --- 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) | |||
| 174 | if (!inode) | 174 | if (!inode) |
| 175 | return 0; | 175 | return 0; |
| 176 | 176 | ||
| 177 | if (nd->flags & LOOKUP_RCU) | 177 | if (nd && (nd->flags & LOOKUP_RCU)) |
| 178 | return -ECHILD; | 178 | return -ECHILD; |
| 179 | 179 | ||
| 180 | fc = get_fuse_conn(inode); | 180 | fc = get_fuse_conn(inode); |