lkml.org 
[lkml]   [2019]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH 2/2] nvmet-rdma: Fix use-after-free bug when a port is removed
When a port is removed through configfs, any connected controllers
are still active and can still send commands. This causes a
use-after-free bug which is detected by KASAN for any admin command
that dereferences req->port (like in nvmet_execute_identify_ctrl).

To fix this, disconnect all active queues that use the same port
in nvme_rdma_remove_port().

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
drivers/nvme/target/rdma.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index 36d906a7f70d..6db9f9586ca7 100644
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -1580,9 +1580,25 @@ static int nvmet_rdma_add_port(struct nvmet_port *port)
static void nvmet_rdma_remove_port(struct nvmet_port *port)
{
struct rdma_cm_id *cm_id = xchg(&port->priv, NULL);
+ struct nvmet_rdma_queue *queue;

if (cm_id)
rdma_destroy_id(cm_id);
+
+restart:
+ mutex_lock(&nvmet_rdma_queue_mutex);
+
+ list_for_each_entry(queue, &nvmet_rdma_queue_list, queue_list) {
+ if (queue->port == port) {
+ list_del_init(&queue->queue_list);
+ mutex_unlock(&nvmet_rdma_queue_mutex);
+
+ __nvmet_rdma_queue_disconnect(queue);
+ goto restart;
+ }
+ }
+
+ mutex_unlock(&nvmet_rdma_queue_mutex);
}

static void nvmet_rdma_disc_port_addr(struct nvmet_req *req,
--
2.20.1
\
 
 \ /
  Last update: 2019-07-03 19:02    [W:0.057 / U:12.712 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site