diff options
| author | Paul Aurich | 2018-12-31 23:13:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-09 17:38:48 +0100 |
| commit | ba77e8c7f7044394c213e1221e630943c3379a6b (patch) | |
| tree | 10afdbe988e2826730d989ec52b0be0eab996533 /fs/cifs | |
| parent | CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem (diff) | |
| download | kernel-qcow2-linux-ba77e8c7f7044394c213e1221e630943c3379a6b.tar.gz kernel-qcow2-linux-ba77e8c7f7044394c213e1221e630943c3379a6b.tar.xz kernel-qcow2-linux-ba77e8c7f7044394c213e1221e630943c3379a6b.zip | |
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 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/cifs')
| -rw-r--r-- | fs/cifs/smb2ops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 812da3e56a22..f44bb4a304e9 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -3184,8 +3184,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); } |