提交 ba77e8c7 编写于 作者: P Paul Aurich 提交者: Greg Kroah-Hartman

smb3: fix large reads on encrypted connections

commit 6d2f84eee098540ae857998fe32f29b9e2cd9613 upstream.

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 7af929d6
("smb3: fix lease break problem introduced by compounding")

CC: Stable <stable@vger.kernel.org> # 4.19+
Fixes: b24df3e3 ("cifs: update receive_encrypted_standard to handle compounded responses")
Signed-off-by: NPaul Aurich <paul@darkrain42.org>
Tested-by: NYves-Alexis Perez <corsac@corsac.net>
Signed-off-by: NSteve French <stfrench@microsoft.com>
Reviewed-by: NRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 1827d1c4
...@@ -3184,8 +3184,10 @@ smb3_receive_transform(struct TCP_Server_Info *server, ...@@ -3184,8 +3184,10 @@ smb3_receive_transform(struct TCP_Server_Info *server,
} }
/* TODO: add support for compounds containing READ. */ /* 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_read(server, &mids[0]);
}
return receive_encrypted_standard(server, mids, bufs, num_mids); return receive_encrypted_standard(server, mids, bufs, num_mids);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册