]> git.ipfire.org Git - thirdparty/linux.git/commit
smb: client: fix regression with mount options parsing
authorPaulo Alcantara <pc@manguebit.org>
Wed, 11 Feb 2026 04:10:07 +0000 (01:10 -0300)
committerSteve French <stfrench@microsoft.com>
Thu, 12 Feb 2026 20:22:28 +0000 (14:22 -0600)
commit72f4d48034864b93700d1d23fc418d90fa28d7ae
treef517fbfc0195af263c972670570e32621a37723f
parentd53f4d93f3d686fd64513abb3977c9116bbfdaf8
smb: client: fix regression with mount options parsing

After commit 1ef15fbe6771 ("cifs: client: enforce consistent handling
of multichannel and max_channels"), invalid mount options started to
be ignored, allowing cifs.ko to proceed with the mount instead of
baling out.

The problem was related to smb3_handle_conflicting_options() being
called even when an invalid parameter had been parsed, overwriting the
return value of vfs_parse_fs_string() in
smb3_fs_context_parse_monolithic().

Fix this by calling smb3_handle_conflicting_options() only when a
valid mount option has been passed.

Reproducer:

$ mount.cifs //srv/share /mnt -o ${opts}
$ mount -o remount,foo,${opts} /mnt # must fail

Fixes: 1ef15fbe6771 ("cifs: client: enforce consistent handling of multichannel and max_channels")
Reported-by: Xiaoli Feng <xifeng@redhat.com>
Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.org>
Cc: David Howells <dhowells@redhat.com>
Cc: linux-cifs@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/smb/client/fs_context.c