Commit bb1bccb6 authored Jan 17, 2019 by Pavel Shilovsky Committed by Steve French Mar 04, 2019

CIFS: Respect SMB2 hdr preamble size in read responses



There are a couple places where we still account for 4 bytes
in the beginning of SMB2 packet which is not true in the current
code. Fix this to use a header preamble size where possible.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

parent 66265f13

fs/cifs/cifssmb.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1612,9 +1612,10 @@ cifs_readv_receive(struct TCP_Server_Info server, struct mid_q_entry mid)

		/* set up first two iov for signature check and to get credits */
		rdata->iov[0].iov_base = buf;
		rdata->iov[0].iov_len = 4;
		rdata->iov[1].iov_base = buf + 4;
		rdata->iov[1].iov_len = server->total_read - 4;
		rdata->iov[0].iov_len = server->vals->header_preamble_size;
		rdata->iov[1].iov_base = buf + server->vals->header_preamble_size;
		rdata->iov[1].iov_len =
		server->total_read - server->vals->header_preamble_size;
		cifs_dbg(FYI, "0: iov_base=%p iov_len=%zu\n",
		rdata->iov[0].iov_base, rdata->iov[0].iov_len);
		cifs_dbg(FYI, "1: iov_base=%p iov_len=%zu\n",

fs/cifs/smb2ops.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3244,10 +3244,10 @@ handle_read_data(struct TCP_Server_Info server, struct mid_q_entry mid,

		/* set up first two iov to get credits */
		rdata->iov[0].iov_base = buf;
		rdata->iov[0].iov_len = 4;
		rdata->iov[1].iov_base = buf + 4;
		rdata->iov[0].iov_len = 0;
		rdata->iov[1].iov_base = buf;
		rdata->iov[1].iov_len =
		min_t(unsigned int, buf_len, server->vals->read_rsp_size) - 4;
		min_t(unsigned int, buf_len, server->vals->read_rsp_size);
		cifs_dbg(FYI, "0: iov_base=%p iov_len=%zu\n",
		rdata->iov[0].iov_base, rdata->iov[0].iov_len);
		cifs_dbg(FYI, "1: iov_base=%p iov_len=%zu\n",