]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
nvmet-rdma: fix use-after-free when a port is removed
authorIsrael Rukshin <israelr@nvidia.com>
Wed, 6 Oct 2021 08:09:44 +0000 (08:09 +0000)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:48:17 +0000 (09:48 +0100)
BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit fcf73a804c7d6bbf0ea63531c6122aa363852e04 ]

When removing a port, all its controllers are being removed, but there
are queues on the port that doesn't belong to any controller (during
connection time). This causes a use-after-free bug for any command
that dereferences req->port (like in nvmet_alloc_ctrl). Those queues
should be destroyed before freeing the port via configfs. Destroy the
remaining queues after the RDMA-CM was destroyed guarantees that no
new queue will be created.

Signed-off-by: Israel Rukshin <israelr@nvidia.com>
Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/nvme/target/rdma.c

index 891174ccd44bb3cd1a96042313b7e7e79282cb82..f1eedbf493d5b36377db7d735ba9e3b8c8f0c769 100644 (file)
@@ -1818,12 +1818,36 @@ restart:
        mutex_unlock(&nvmet_rdma_queue_mutex);
 }
 
+static void nvmet_rdma_destroy_port_queues(struct nvmet_rdma_port *port)
+{
+       struct nvmet_rdma_queue *queue, *tmp;
+       struct nvmet_port *nport = port->nport;
+
+       mutex_lock(&nvmet_rdma_queue_mutex);
+       list_for_each_entry_safe(queue, tmp, &nvmet_rdma_queue_list,
+                                queue_list) {
+               if (queue->port != nport)
+                       continue;
+
+               list_del_init(&queue->queue_list);
+               __nvmet_rdma_queue_disconnect(queue);
+       }
+       mutex_unlock(&nvmet_rdma_queue_mutex);
+}
+
 static void nvmet_rdma_disable_port(struct nvmet_rdma_port *port)
 {
        struct rdma_cm_id *cm_id = xchg(&port->cm_id, NULL);
 
        if (cm_id)
                rdma_destroy_id(cm_id);
+
+       /*
+        * Destroy the remaining queues, which are not belong to any
+        * controller yet. Do it here after the RDMA-CM was destroyed
+        * guarantees that no new queue will be created.
+        */
+       nvmet_rdma_destroy_port_queues(port);
 }
 
 static int nvmet_rdma_enable_port(struct nvmet_rdma_port *port)