]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nvme-rdma: fix crash due to incorrect cqe
authorChao Leng <lengchao@huawei.com>
Mon, 12 Oct 2020 08:55:37 +0000 (16:55 +0800)
committerChristoph Hellwig <hch@lst.de>
Thu, 22 Oct 2020 13:27:14 +0000 (15:27 +0200)
A crash happened due to injecting error test.
When a CQE has incorrect command id due do an error injection, the host
may find a request which is already freed.  Dereferencing req->mr->rkey
causes a crash in nvme_rdma_process_nvme_rsp because the mr is already
freed.

Add a check for the mr to fix it.

Signed-off-by: Chao Leng <lengchao@huawei.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/rdma.c

index 116902b1b2c347ca7939f8e8eeae0271e1c3629d..aad829a2b50d0f9348bd819f75dd35bc53bc1a51 100644 (file)
@@ -1730,10 +1730,11 @@ static void nvme_rdma_process_nvme_rsp(struct nvme_rdma_queue *queue,
        req->result = cqe->result;
 
        if (wc->wc_flags & IB_WC_WITH_INVALIDATE) {
-               if (unlikely(wc->ex.invalidate_rkey != req->mr->rkey)) {
+               if (unlikely(!req->mr ||
+                            wc->ex.invalidate_rkey != req->mr->rkey)) {
                        dev_err(queue->ctrl->ctrl.device,
                                "Bogus remote invalidation for rkey %#x\n",
-                               req->mr->rkey);
+                               req->mr ? req->mr->rkey : 0);
                        nvme_rdma_error_recovery(queue->ctrl);
                }
        } else if (req->mr) {