From: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: linux-cifs <linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Peter Maloney
<peter.maloney-bU717sqhW2kTELwDM1PSjyEWGD4kr0XT@public.gmane.org>
Subject: Re: [PATCH] cifs: Allow passwords which begin with a delimitor
Date: Wed, 10 Apr 2013 07:05:25 -0400 [thread overview]
Message-ID: <20130410070525.640b460f@corrin.poochiereds.net> (raw)
In-Reply-To: <1365527861-6624-1-git-send-email-sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
On Tue, 9 Apr 2013 18:17:41 +0100
Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> 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-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
> fs/cifs/connect.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 12b3da3..f7199b9 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -1546,14 +1546,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++;
Looks reasonable to me. Should this also go to stable?
Acked-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
next prev parent reply other threads:[~2013-04-10 11:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 17:17 [PATCH] cifs: Allow passwords which begin with a delimitor Sachin Prabhu
[not found] ` <1365527861-6624-1-git-send-email-sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-04-10 11:05 ` Jeff Layton [this message]
[not found] ` <20130410070525.640b460f-4QP7MXygkU+dMjc06nkz3ljfA9RmPOcC@public.gmane.org>
2013-04-10 11:47 ` Sachin Prabhu
2013-04-10 20:57 ` Steve French
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130410070525.640b460f@corrin.poochiereds.net \
--to=jlayton-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=peter.maloney-bU717sqhW2kTELwDM1PSjyEWGD4kr0XT@public.gmane.org \
--cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox