summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-12-06 21:07:33 -0500
committerSteve French <sfrench@us.ibm.com>2010-12-07 19:17:59 +0000
commit03ceace5c6923ffbcf2b4d2e37afbffbdb5d4a67 (patch)
tree5f8630682dbc8e7e0b38c47e1403945b0b5d07d6 /fs/cifs
parent884639996814585ef7079daa9e03a1eb562e235c (diff)
downloadop-kernel-dev-03ceace5c6923ffbcf2b4d2e37afbffbdb5d4a67.zip
op-kernel-dev-03ceace5c6923ffbcf2b4d2e37afbffbdb5d4a67.tar.gz
cifs: fix check of error return from is_path_accessable
This function will return 0 if everything went ok. Commit 9d002df4 however added a block of code after the following check for rc == -EREMOTE. With that change and when rc == 0, doing the "goto mount_fail_check" here skips that code, leaving the tlink_tree and master_tlink pointer unpopulated. That causes an oops later in cifs_root_iget. Reported-and-Tested-by: Robbert Kouprie <robbert@exx.nl> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 53f9c31..387b91a 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2839,7 +2839,7 @@ remote_path_check:
goto mount_fail_check;
}
rc = is_path_accessible(xid, tcon, cifs_sb, full_path);
- if (rc != -EREMOTE) {
+ if (rc != 0 && rc != -EREMOTE) {
kfree(full_path);
goto mount_fail_check;
}
OpenPOWER on IntegriCloud