Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee4d28a7 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Greg Kroah-Hartman
Browse files

CIFS: Respect SMB2 hdr preamble size in read responses 



[ Upstream commit bb1bccb60c2ebd9a6f895507d1d48d5ed773814e ]

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: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2a202268

fs/cifs/cifssmb.c

+4 −3
Original line number Diff line number Diff line
@@ -1521,9 +1521,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
@@ -3000,10 +3000,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",