cifs: fix credit accounting for extra channel

commit a249cc8bc2e2fed680047d326eb9a50756724198 upstream.

With multichannel, operations like the queries
from "ls -lR" can cause all credits to be used and
errors to be returned since max_credits was not
being set correctly on the secondary channels and
thus the client was requesting 0 credits incorrectly
in some cases (which can lead to not having
enough credits to perform any operation on that
channel).

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
CC: <stable@vger.kernel.org> # v5.8+
Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index ad3ecda..fa359f4 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2629,6 +2629,11 @@ smbd_connected:
        tcp_ses->min_offload = volume_info->min_offload;
        tcp_ses->tcpStatus = CifsNeedNegotiate;
 
+       if ((volume_info->max_credits < 20) || (volume_info->max_credits > 60000))
+               tcp_ses->max_credits = SMB2_MAX_CREDITS_AVAILABLE;
+       else
+               tcp_ses->max_credits = volume_info->max_credits;
+
        tcp_ses->nr_targets = 1;
        tcp_ses->ignore_signature = volume_info->ignore_signature;
        /* thread spawned, put it on the list */
@@ -4077,11 +4082,6 @@ static int mount_get_conns(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
 
        *nserver = server;
 
-       if ((vol->max_credits < 20) || (vol->max_credits > 60000))
-               server->max_credits = SMB2_MAX_CREDITS_AVAILABLE;
-       else
-               server->max_credits = vol->max_credits;
-
        /* get a reference to a SMB session */
        ses = cifs_get_smb_ses(server, vol);
        if (IS_ERR(ses)) {

diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index de56436..c2fe85c 100644 (file)
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -224,6 +224,7 @@ cifs_ses_add_channel(struct cifs_ses *ses, struct cifs_server_iface *iface)
        vol.noautotune = ses->server->noautotune;
        vol.sockopt_tcp_nodelay = ses->server->tcp_nodelay;
        vol.echo_interval = ses->server->echo_interval / HZ;
+       vol.max_credits = ses->server->max_credits;
 
        /*
         * This will be used for encoding/decoding user/domain/pw