[v2] nvmet-rdma: Fix a possible uninitialized variable dereference

Commit Message

Raju Rangoju March 14, 2017, 12:56 p.m. UTC

Patch looks good. 

Tested-by: Raju Rangoju <[e-mail]>

-----Original Message-----
From: [e-mail] [mailto:[e-mail]] On Behalf Of Sagi Grimberg
Sent: 13 March 2017 19:10
To: [e-mail]; [e-mail]
Cc: Christoph Hellwig <[e-mail]>
Subject: [PATCH v2] nvmet-rdma: Fix a possible uninitialized variable dereference

When handling a new recv command, we grab a new rsp resource and check for the queue state being live. In case the queue is not in live state, we simply restore the rsp back to the free list. However in this flow we didn't set rsp->queue yet, so we cannot dereference it.

Instead, make sure to initialize rsp->queue (and other rsp members) as soon as possible so we won't reference uninitialized variables.

Reported-by: Yi Zhang <[e-mail]>
Reported-by: Raju Rangoju <[e-mail]>
Signed-off-by: Sagi Grimberg <[e-mail]>
---
- v1 broke srq, this one doesn't

 drivers/nvme/target/rdma.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

 
 	cmd->queue = queue;
 	rsp = nvmet_rdma_get_rsp(queue);
+	rsp->queue = queue;
 	rsp->cmd = cmd;
 	rsp->flags = 0;
 	rsp->req.cmd = cmd->nvme_cmd;
+	rsp->req.port = queue->port;
+	rsp->n_rdma = 0;
 
 	if (unlikely(queue->state != NVMET_RDMA_Q_LIVE)) {
 		unsigned long flags;
--
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [e-mail] More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c index 9aa1da3778b3..ecc4fe862561 100644
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -703,11 +703,6 @@  static void nvmet_rdma_handle_command(struct nvmet_rdma_queue *queue,  {
 	u16 status;
 
-	cmd->queue = queue;
-	cmd->n_rdma = 0;
-	cmd->req.port = queue->port;
-
-
 	ib_dma_sync_single_for_cpu(queue->dev->device,
 		cmd->cmd->sge[0].addr, cmd->cmd->sge[0].length,
 		DMA_FROM_DEVICE);
@@ -760,9 +755,12 @@  static void nvmet_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc)