Skip to content

Commit fc99045

Browse files
Paulo AlcantaraSteve French
authored andcommitted
smb: client: fix regression with guest option
When mounting a CIFS share with 'guest' mount option, mount.cifs(8) will set empty password= and password2= options. Currently we only handle empty strings from user= and password= options, so the mount will fail with cifs: Bad value for 'password2' Fix this by handling empty string from password2= option as well. Link: https://bbs.archlinux.org/viewtopic.php?id=303927 Reported-by: Adam Williamson <awilliam@redhat.com> Closes: https://lore.kernel.org/r/83c00b5fea81c07f6897a5dd3ef50fd3b290f56c.camel@redhat.com Fixes: 35f8342 ("smb3: fix broken reconnect when password changing on the server by allowing password rotation") Cc: stable@vger.kernel.org Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.com> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 80e54e8 commit fc99045

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

fs/smb/client/fs_context.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ const struct fs_parameter_spec smb3_fs_parameters[] = {
171171
fsparam_string("username", Opt_user),
172172
fsparam_string("pass", Opt_pass),
173173
fsparam_string("password", Opt_pass),
174+
fsparam_string("pass2", Opt_pass2),
174175
fsparam_string("password2", Opt_pass2),
175176
fsparam_string("ip", Opt_ip),
176177
fsparam_string("addr", Opt_ip),
@@ -1131,6 +1132,9 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
11311132
} else if (!strcmp("user", param->key) || !strcmp("username", param->key)) {
11321133
skip_parsing = true;
11331134
opt = Opt_user;
1135+
} else if (!strcmp("pass2", param->key) || !strcmp("password2", param->key)) {
1136+
skip_parsing = true;
1137+
opt = Opt_pass2;
11341138
}
11351139
}
11361140

0 commit comments

Comments
 (0)