From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>
Cc: Stephen Bates <sbates@raithlin.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH 2/2] nvmet-rdma: Fix use-after-free bug when a port is removed
Date: Wed, 3 Jul 2019 11:01:36 -0600 [thread overview]
Message-ID: <20190703170136.21515-3-logang@deltatee.com> (raw)
In-Reply-To: <20190703170136.21515-1-logang@deltatee.com>
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
next prev parent reply other threads:[~2019-07-03 17:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 17:01 [PATCH 0/2] Fix use-after-free bug when ports are removed Logan Gunthorpe
2019-07-03 17:01 ` [PATCH 1/2] nvmet-loop: Fix use-after-free bug when a port is removed Logan Gunthorpe
2019-07-03 17:01 ` Logan Gunthorpe [this message]
2019-07-03 17:33 ` [PATCH 0/2] Fix use-after-free bug when ports are removed Sagi Grimberg
2019-07-03 18:13 ` Logan Gunthorpe
2019-07-03 19:20 ` Sagi Grimberg
2019-07-03 19:24 ` Logan Gunthorpe
2019-07-03 19:19 ` Logan Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190703170136.21515-3-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=sbates@raithlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®