Fixed some checkpatch warnings and added Paulo's RB, and updated
cifs-2.6.git for-next
On Tue, Aug 15, 2023 at 1:42 PM Paulo Alcantara via samba-technical
<samba-technical@xxxxxxxxxxxxxxx> wrote:
>
> Scott Mayhew <smayhew@xxxxxxxxxx> writes:
>
> > Commit abdb1742a312 removed code that clears ctx->username when
> > sec=none, so attempting to mount with '-o sec=none' now fails with
> > -EACCES. Fix it by adding that logic to the parsing of the 'sec'
> > option, as well as checking if the mount is using null auth before
> > setting the username when parsing the 'user' option.
> >
> > Fixes: abdb1742a312 ("cifs: get rid of mount options string parsing")
> > Signed-off-by: Scott Mayhew <smayhew@xxxxxxxxxx>
> > ---
> > fs/smb/client/fs_context.c | 4 ++++
> > 1 file changed, 4 insertions(+)
>
> Reviewed-by: Paulo Alcantara (SUSE) <pc@xxxxxxxxxxxxx>
>
--
Thanks,
Steve
From 270d73e6507f9c7fff43844d74f86365df000b36 Mon Sep 17 00:00:00 2001
From: Scott Mayhew <smayhew@xxxxxxxxxx>
Date: Wed, 16 Aug 2023 00:23:56 -0500
Subject: [PATCH] smb: client: fix null auth
Commit abdb1742a312 removed code that clears ctx->username when sec=none, so attempting
to mount with '-o sec=none' now fails with -EACCES. Fix it by adding that logic to the
parsing of the 'sec' option, as well as checking if the mount is using null auth before
setting the username when parsing the 'user' option.
Fixes: abdb1742a312 ("cifs: get rid of mount options string parsing")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Scott Mayhew <smayhew@xxxxxxxxxx>
Reviewed-by: Paulo Alcantara (SUSE) <pc@xxxxxxxxxxxxx>
Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx>
---
fs/smb/client/fs_context.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
index 4946a0c59600..67e16c2ac90e 100644
--- a/fs/smb/client/fs_context.c
+++ b/fs/smb/client/fs_context.c
@@ -231,6 +231,8 @@ cifs_parse_security_flavors(struct fs_context *fc, char *value, struct smb3_fs_c
break;
case Opt_sec_none:
ctx->nullauth = 1;
+ kfree(ctx->username);
+ ctx->username = NULL;
break;
default:
cifs_errorf(fc, "bad security option: %s\n", value);
@@ -1201,6 +1203,8 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
case Opt_user:
kfree(ctx->username);
ctx->username = NULL;
+ if (ctx->nullauth)
+ break;
if (strlen(param->string) == 0) {
/* null user, ie. anonymous authentication */
ctx->nullauth = 1;
--
2.34.1
