nvmet: always initialize cqe.result

[ Upstream commit cd0c1b8e045a8d2785342b385cb2684d9b48e426 ]

The spec doesn't mandate that the first two double words (aka results)
for the command queue entry need to be set to 0 when they are not
used (not specified). Though, the target implemention returns 0 for TCP
and FC but not for RDMA.

Let's make RDMA behave the same and thus explicitly initializing the
result field. This prevents leaking any data from the stack.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 06f0c587f3437b8bdd57276a3929b91e2319e013..4ff460ba282633f48a92035b7fe72a01a5995e61 100644 (file)
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -957,6 +957,7 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,
        req->metadata_sg_cnt = 0;
        req->transfer_len = 0;
        req->metadata_len = 0;
+       req->cqe->result.u64 = 0;
        req->cqe->status = 0;
        req->cqe->sq_head = 0;
        req->ns = NULL;

diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
index eb7785be0ca770c68c0084059f0a4f23b06f6dff..ee76491e8b12c54f4a2dff986ac92fabb648ad5a 100644 (file)
--- a/drivers/nvme/target/fabrics-cmd-auth.c
+++ b/drivers/nvme/target/fabrics-cmd-auth.c
@@ -332,7 +332,6 @@ done:
                pr_debug("%s: ctrl %d qid %d nvme status %x error loc %d\n",
                         __func__, ctrl->cntlid, req->sq->qid,
                         status, req->error_loc);
-       req->cqe->result.u64 = 0;
        if (req->sq->dhchap_step != NVME_AUTH_DHCHAP_MESSAGE_SUCCESS2 &&
            req->sq->dhchap_step != NVME_AUTH_DHCHAP_MESSAGE_FAILURE2) {
                unsigned long auth_expire_secs = ctrl->kato ? ctrl->kato : 120;
@@ -515,8 +514,6 @@ void nvmet_execute_auth_receive(struct nvmet_req *req)
        status = nvmet_copy_to_sgl(req, 0, d, al);
        kfree(d);
 done:
-       req->cqe->result.u64 = 0;
-
        if (req->sq->dhchap_step == NVME_AUTH_DHCHAP_MESSAGE_SUCCESS2)
                nvmet_auth_sq_free(req->sq);
        else if (req->sq->dhchap_step == NVME_AUTH_DHCHAP_MESSAGE_FAILURE1) {

diff --git a/drivers/nvme/target/fabrics-cmd.c b/drivers/nvme/target/fabrics-cmd.c
index b23f4cf840bd541ca3f0215cda994549273a43b3..f6714453b8bb30b8dbb13bed568077ba991b117b 100644 (file)
--- a/drivers/nvme/target/fabrics-cmd.c
+++ b/drivers/nvme/target/fabrics-cmd.c
@@ -226,9 +226,6 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)
        if (status)
                goto out;
 
-       /* zero out initial completion result, assign values as needed */
-       req->cqe->result.u32 = 0;
-
        if (c->recfmt != 0) {
                pr_warn("invalid connect version (%d).\n",
                        le16_to_cpu(c->recfmt));
@@ -304,9 +301,6 @@ static void nvmet_execute_io_connect(struct nvmet_req *req)
        if (status)
                goto out;
 
-       /* zero out initial completion result, assign values as needed */
-       req->cqe->result.u32 = 0;
-
        if (c->recfmt != 0) {
                pr_warn("invalid connect version (%d).\n",
                        le16_to_cpu(c->recfmt));