summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-12 15:18:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-12 15:18:20 -0700
commit0b1fd266bffdab61f5936c9b67d892b353cbf54e (patch)
tree42098cb8e8cf57153af7052dfedbe04ca2e6be40
parent6074fffbf8cd4d966b29c17a25f0b336074ebc28 (diff)
parentc369c9a4a7c82d33329d869cbaf93304cc7a0c40 (diff)
downloadlinux-3.10-0b1fd266bffdab61f5936c9b67d892b353cbf54e.tar.gz
linux-3.10-0b1fd266bffdab61f5936c9b67d892b353cbf54e.tar.bz2
linux-3.10-0b1fd266bffdab61f5936c9b67d892b353cbf54e.zip
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fix from Steve French: "Fixes a regression in cifs in which a password which begins with a comma is parsed incorrectly as a blank password" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: Allow passwords which begin with a delimitor
-rw-r--r--fs/cifs/connect.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 991c63c6bdd..21b3a291c32 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1575,14 +1575,24 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
}
break;
case Opt_blank_pass:
- vol->password = NULL;
- break;
- case Opt_pass:
/* passwords have to be handled differently
* to allow the character used for deliminator
* to be passed within them
*/
+ /*
+ * Check if this is a case where the password
+ * starts with a delimiter
+ */
+ tmp_end = strchr(data, '=');
+ tmp_end++;
+ if (!(tmp_end < end && tmp_end[1] == delim)) {
+ /* No it is not. Set the password to NULL */
+ vol->password = NULL;
+ break;
+ }
+ /* Yes it is. Drop down to Opt_pass below.*/
+ case Opt_pass:
/* Obtain the value string */
value = strchr(data, '=');
value++;