Re: [PATCH] cifs: make sure we ignore the credentials= and cred= options

[Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

On Wed, 2012-05-02 at 14:03 -0400, Jeff Layton wrote:
> Older mount.cifs programs passed this on to the kernel after parsing
> the file. Make sure the kernel ignores that option.
> 
> Should fix:
> 
>     https://bugzilla.kernel.org/show_bug.cgi?id=43195
> 
> Cc: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Reported-by: Ronald <ronald645-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  fs/cifs/connect.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index a75902b..5dcc551 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -215,6 +215,8 @@ static const match_table_t cifs_mount_option_tokens = {
>  
>  	{ Opt_ignore, "cred" },
>  	{ Opt_ignore, "credentials" },
> +	{ Opt_ignore, "cred=%s" },
> +	{ Opt_ignore, "credentials=%s" },

We don't expect cred/credentials by themselves in the mount options
list. Instead of adding the new checks, we can instead simply replace
the original lines with ones containing the string.

-       { Opt_ignore, "cred" },
-       { Opt_ignore, "credentials" },
+       { Opt_ignore, "cred=%s" },
+       { Opt_ignore, "credentials=%s" },

Sachin Prabhu