openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Pavel Shilovsky 2011-08-21 19:30:15 +04:00 committed by Steve French
parent 9438fabb73
commit 5b980b0121
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/cifs/cifsfs.c
View File

@ -548,6 +548,12 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb)
struct inode *dir = dentry->d_inode; struct inode *dir = dentry->d_inode;
struct dentry *child; struct dentry *child;
if (!dir) {
dput(dentry);
dentry = ERR_PTR(-ENOENT);
break;
}
/* skip separators */ /* skip separators */
while (*s == sep) while (*s == sep)
s++; s++;
@ -563,10 +569,6 @@ cifs_get_root(struct smb_vol *vol, struct super_block *sb)
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
dput(dentry); dput(dentry);
dentry = child; dentry = child;
if (!dentry->d_inode) {
dput(dentry);
dentry = ERR_PTR(-ENOENT);
}
} while (!IS_ERR(dentry)); } while (!IS_ERR(dentry));
_FreeXid(xid); _FreeXid(xid);
kfree(full_path); kfree(full_path);