From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 548B8C0650E for ; Wed, 3 Jul 2019 17:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3446F218A0 for ; Wed, 3 Jul 2019 17:01:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727074AbfGCRBl (ORCPT ); Wed, 3 Jul 2019 13:01:41 -0400 Received: from ale.deltatee.com ([207.54.116.67]:36956 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725847AbfGCRBl (ORCPT ); Wed, 3 Jul 2019 13:01:41 -0400 Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hiidX-0000Cc-9D; Wed, 03 Jul 2019 11:01:40 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.89) (envelope-from ) id 1hiidW-0005bq-7S; Wed, 03 Jul 2019 11:01:38 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, Christoph Hellwig , Sagi Grimberg Cc: Stephen Bates , Logan Gunthorpe Date: Wed, 3 Jul 2019 11:01:36 -0600 Message-Id: <20190703170136.21515-3-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703170136.21515-1-logang@deltatee.com> References: <20190703170136.21515-1-logang@deltatee.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, hch@lst.de, sagi@grimberg.me, sbates@raithlin.com, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH 2/2] nvmet-rdma: Fix use-after-free bug when a port is removed X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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