diff options
| author | Pavel Shilovsky <piastryyy@gmail.com> | 2011-07-25 17:59:10 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-04 21:58:33 -0700 |
| commit | e181f90e497752b371229fd8d46f1f7cc4d3e3ec (patch) | |
| tree | 33baef99d638a0c00754201d6d7efea824e666aa /fs/cifs | |
| parent | 79db0af8b41b543e1fa684a4eb5949663aa52ae4 (diff) | |
| download | kernel_samsung_smdk4412-e181f90e497752b371229fd8d46f1f7cc4d3e3ec.zip kernel_samsung_smdk4412-e181f90e497752b371229fd8d46f1f7cc4d3e3ec.tar.gz kernel_samsung_smdk4412-e181f90e497752b371229fd8d46f1f7cc4d3e3ec.tar.bz2 | |
CIFS: Fix oops while mounting with prefixpath
commit f5bc1e755d23d022bf948904386337fc3e5e29a8 upstream.
commit fec11dd9a0109fe52fd631e5c510778d6cbff6cc caused
a regression when we have already mounted //server/share/a
and want to mount //server/share/a/b.
The problem is that lookup_one_len calls __lookup_hash
with nd pointer as NULL. Then __lookup_hash calls
do_revalidate in the case when dentry exists and we end
up with NULL pointer deference in cifs_d_revalidate:
if (nd->flags & LOOKUP_RCU)
return -ECHILD;
Fix this by checking nd for NULL.
Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Shirish Pargaonkar <shirishp@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index fa8c21d..d8d26f3 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -641,7 +641,7 @@ lookup_out: static int cifs_d_revalidate(struct dentry *direntry, struct nameidata *nd) { - if (nd->flags & LOOKUP_RCU) + if (nd && (nd->flags & LOOKUP_RCU)) return -ECHILD; if (direntry->d_inode) { |