diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-08-29 18:54:12 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:35 -0700 |
| commit | 562960c731b9ffba8cd200be8d38f5f793b23d74 (patch) | |
| tree | e13a1777b8ba3edbc13032136cd7a0869ac18dff /fs/cifs | |
| parent | 862bee39ef540bd3a7772b899b4fa7f3036abf0d (diff) | |
| download | kernel_samsung_smdk4412-562960c731b9ffba8cd200be8d38f5f793b23d74.zip kernel_samsung_smdk4412-562960c731b9ffba8cd200be8d38f5f793b23d74.tar.gz kernel_samsung_smdk4412-562960c731b9ffba8cd200be8d38f5f793b23d74.tar.bz2 | |
Fix the conflict between rwpidforward and rw mount options
commit c9c7fa0064f4afe1d040e72f24c2256dd8ac402d upstream.
Both these options are started with "rw" - that's why the first one
isn't switched on even if it is specified. Fix this by adding a length
check for "rw" option check.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
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/connect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e0ea721..2451627 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1258,7 +1258,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, /* ignore */ } else if (strnicmp(data, "guest", 5) == 0) { /* ignore */ - } else if (strnicmp(data, "rw", 2) == 0) { + } else if (strnicmp(data, "rw", 2) == 0 && strlen(data) == 2) { /* ignore */ } else if (strnicmp(data, "ro", 2) == 0) { /* ignore */ @@ -1361,7 +1361,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, vol->server_ino = 1; } else if (strnicmp(data, "noserverino", 9) == 0) { vol->server_ino = 0; - } else if (strnicmp(data, "rwpidforward", 4) == 0) { + } else if (strnicmp(data, "rwpidforward", 12) == 0) { vol->rwpidforward = 1; } else if (strnicmp(data, "cifsacl", 7) == 0) { vol->cifs_acl = 1; |