From: Logan Gunthorpe <logang@deltatee.com>

Date: Wed, 23 Oct 2019 10:35:40 -0600

Subject: [PATCH] nvmet-tcp: Don't set the request's data_len

Git-commit: c73eebc07a0fc8f4ea0f69c65803595d6471bb47

Patch-mainline: v5.5-rc1

References: bsc#1169045

It's not apprporiate for the transports to set the data_len

field of the request which is only used by the core.

In this case, just use a variable on the stack to store the

length of the sgl for comparison.

Reviewed-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>

Signed-off-by: Keith Busch <kbusch@kernel.org>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/nvme/target/tcp.c | 6 ++----

 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c

index 1e2d92f818ad..3378480c49f6 100644

--- a/drivers/nvme/target/tcp.c

+++ b/drivers/nvme/target/tcp.c

@@ -813,13 +813,11 @@ static int nvmet_tcp_handle_icreq(struct nvmet_tcp_queue *queue)

 static void nvmet_tcp_handle_req_failure(struct nvmet_tcp_queue *queue,

 		struct nvmet_tcp_cmd *cmd, struct nvmet_req *req)

 {

+	size_t data_len = le32_to_cpu(req->cmd->common.dptr.sgl.length);

 	int ret;

-	/* recover the expected data transfer length */

-	req->data_len = le32_to_cpu(req->cmd->common.dptr.sgl.length);

-

 	if (!nvme_is_write(cmd->req.cmd) ||

-	    req->data_len > cmd->req.port->inline_data_size) {

+	    data_len > cmd->req.port->inline_data_size) {

 		nvmet_prepare_receive_pdu(queue);

 		return;

 	}

-- 

2.16.4