| From c369c9a4a7c82d33329d869cbaf93304cc7a0c40 Mon Sep 17 00:00:00 2001 |
| From: Sachin Prabhu <sprabhu@redhat.com> |
| Date: Tue, 9 Apr 2013 18:17:41 +0100 |
| Subject: cifs: Allow passwords which begin with a delimitor |
| |
| From: Sachin Prabhu <sprabhu@redhat.com> |
| |
| commit c369c9a4a7c82d33329d869cbaf93304cc7a0c40 upstream. |
| |
| 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> |
| Signed-off-by: Steve French <sfrench@us.ibm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/cifs/connect.c | 16 +++++++++++++--- |
| 1 file changed, 13 insertions(+), 3 deletions(-) |
| |
| --- a/fs/cifs/connect.c |
| +++ b/fs/cifs/connect.c |
| @@ -1546,14 +1546,24 @@ cifs_parse_mount_options(const char *mou |
| } |
| 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++; |
