diff options
| author | Pavel Shilovsky <piastryyy@gmail.com> | 2011-08-21 19:30:15 +0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-09-19 21:15:03 -0500 |
| commit | 5b980b01212199833ee8023770fa4cbf1b85e9f4 (patch) | |
| tree | 71a184539229d6067185a3b57bebb6e422a7c48f | |
| parent | 9438fabb73eb48055b58b89fc51e0bc4db22fabd (diff) | |
| download | blackbird-op-linux-5b980b01212199833ee8023770fa4cbf1b85e9f4.tar.gz blackbird-op-linux-5b980b01212199833ee8023770fa4cbf1b85e9f4.zip | |
CIFS: Fix ERR_PTR dereference in cifs_get_root
move it to the beginning of the loop.
Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/cifsfs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index f93eb948d071..54b8f1e7da94 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -548,6 +548,12 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb) struct inode *dir = dentry->d_inode; struct dentry *child; + if (!dir) { + dput(dentry); + dentry = ERR_PTR(-ENOENT); + break; + } + /* skip separators */ while (*s == sep) s++; @@ -563,10 +569,6 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb) mutex_unlock(&dir->i_mutex); dput(dentry); dentry = child; - if (!dentry->d_inode) { - dput(dentry); - dentry = ERR_PTR(-ENOENT); - } } while (!IS_ERR(dentry)); _FreeXid(xid); kfree(full_path); |
