diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2013-04-09 18:17:41 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2013-04-10 15:54:14 -0500 |
| commit | c369c9a4a7c82d33329d869cbaf93304cc7a0c40 (patch) | |
| tree | cbe547bd29cdf16660ce244cf6f15820e412c311 /fs/cifs | |
| parent | 66ade474237745a57b7e87da9a93c7ec69fd52bb (diff) | |
| download | blackbird-op-linux-c369c9a4a7c82d33329d869cbaf93304cc7a0c40.tar.gz blackbird-op-linux-c369c9a4a7c82d33329d869cbaf93304cc7a0c40.zip | |
cifs: Allow passwords which begin with a delimitor
Fixes a regression in cifs_parse_mount_options where a password
which begins with a delimitor is parsed incorrectly as being a blank
password.
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/connect.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 991c63c6bdd0..21b3a291c327 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++; |
