smb3: fix large reads on encrypted connections
authorPaul Aurich <paul@darkrain42.org>
Mon, 31 Dec 2018 22:13:34 +0000 (14:13 -0800)
committerSteve French <stfrench@microsoft.com>
Thu, 3 Jan 2019 05:03:56 +0000 (23:03 -0600)
When passing a large read to receive_encrypted_read(), ensure that the
demultiplex_thread knows that a MID was processed.  Without this, those
operations never complete.

This is a similar issue/fix to lease break handling:
commit 7af929d6d05ba5564139718e30d5bc96bdbc716a
("smb3: fix lease break problem introduced by compounding")

CC: Stable <stable@vger.kernel.org> # 4.19+
Fixes: b24df3e30cbf ("cifs: update receive_encrypted_standard to handle compounded responses")
Signed-off-by: Paul Aurich <paul@darkrain42.org>
Tested-by: Yves-Alexis Perez <corsac@corsac.net>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
fs/cifs/smb2ops.c

index 33100ef74d7f1df2556094bd4e319d5e5a009b4e..cf7eb891804f6f527b7fd4a7512dfc6d66309042 100644 (file)
@@ -3472,8 +3472,10 @@ smb3_receive_transform(struct TCP_Server_Info *server,
        }
 
        /* TODO: add support for compounds containing READ. */
-       if (pdu_length > CIFSMaxBufSize + MAX_HEADER_SIZE(server))
+       if (pdu_length > CIFSMaxBufSize + MAX_HEADER_SIZE(server)) {
+               *num_mids = 1;
                return receive_encrypted_read(server, &mids[0]);
+       }
 
        return receive_encrypted_standard(server, mids, bufs, num_mids);
 }