Commit 9e37b178 authored Aug 24, 2017 by Pavel Shilovsky Committed by Steve French Aug 30, 2017

CIFS: Fix maximum SMB2 header size



Currently the maximum size of SMB2/3 header is set incorrectly which
leads to hanging of directory listing operations on encrypted SMB3
connections. Fix this by setting the maximum size to 170 bytes that
is calculated as RFC1002 length field size (4) + transform header
size (52) + SMB2 header size (64) + create response size (56).

Cc: <stable@vger.kernel.org>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>

parent 36fde05f

fs/cifs/smb2pdu.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -84,8 +84,8 @@

		#define NUMBER_OF_SMB2_COMMANDS 0x0013

		/* BB FIXME - analyze following length BB */
		#define MAX_SMB2_HDR_SIZE 0x78 /* 4 len + 64 hdr + (224 wct) + 2 bct + 2 pad /
		/* 4 len + 52 transform hdr + 64 hdr + 56 create rsp */
		#define MAX_SMB2_HDR_SIZE 0x00b0

		#define SMB2_PROTO_NUMBER cpu_to_le32(0x424d53fe)
		#define SMB2_TRANSFORM_PROTO_NUM cpu_to_le32(0x424d53fd)

Admin message