This is a note to let you know that I've just added the patch titled smb3: if max_channels set to more than one channel request multichannel to the 5.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: smb3-if-max_channels-set-to-more-than-one-channel-request-multichannel.patch and it can be found in the queue-5.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From c1f8a398b6d661b594556a91224b096d92293061 Mon Sep 17 00:00:00 2001 From: Steve French <stfrench@xxxxxxxxxxxxx> Date: Fri, 7 May 2021 19:33:51 -0500 Subject: smb3: if max_channels set to more than one channel request multichannel From: Steve French <stfrench@xxxxxxxxxxxxx> commit c1f8a398b6d661b594556a91224b096d92293061 upstream. Mounting with "multichannel" is obviously implied if user requested more than one channel on mount (ie mount parm max_channels>1). Currently both have to be specified. Fix that so that if max_channels is greater than 1 on mount, enable multichannel rather than silently falling back to non-multichannel. Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx> Reviewed-By: Tom Talpey <tom@xxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> # v5.11+ Reviewed-by: Shyam Prasad N <sprasad@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/cifs/fs_context.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -978,6 +978,9 @@ static int smb3_fs_context_parse_param(s goto cifs_parse_mount_err; } ctx->max_channels = result.uint_32; + /* If more than one channel requested ... they want multichan */ + if (result.uint_32 > 1) + ctx->multichannel = true; break; case Opt_handletimeout: ctx->handle_timeout = result.uint_32; Patches currently in stable-queue which might be from stfrench@xxxxxxxxxxxxx are queue-5.11/cifs-fix-regression-when-mounting-shares-with-prefix-paths.patch queue-5.11/smb2-fix-use-after-free-in-smb2_ioctl_query_info.patch queue-5.11/cifs-fix-leak-in-cifs_smb3_do_mount-ctx.patch queue-5.11/cifs-return-correct-error-code-from-smb2_get_enc_key.patch queue-5.11/cifs-detect-dead-connections-only-when-echoes-are-enabled.patch queue-5.11/cifs-fix-out-of-bound-memory-access-when-calling-smb3_notify-at-mount-point.patch queue-5.11/smb3-if-max_channels-set-to-more-than-one-channel-request-multichannel.patch queue-5.11/smb3-do-not-attempt-multichannel-to-server-which-does-not-support-it.patch queue-5.11/smb3-when-mounting-with-multichannel-include-it-in-requested-capabilities.patch