android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs: Allow passwords which begin with a delimitor

Browse Source 
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>
This commit is contained in:
Sachin Prabhu 2013-04-09 18:17:41 +01:00 committed by Steve French
parent 66ade47423
commit c369c9a4a7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/cifs/connect.c
View File

@ -1575,14 +1575,24 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
} }
break; break;
case Opt_blank_pass: case Opt_blank_pass:
vol->password = NULL;
break;
case Opt_pass:
/* passwords have to be handled differently /* passwords have to be handled differently
* to allow the character used for deliminator * to allow the character used for deliminator
* to be passed within them * 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 */ /* Obtain the value string */
value = strchr(data, '='); value = strchr(data, '=');
value++; value++;