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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 94F00C2D0A3 for ; Mon, 26 Oct 2020 23:57:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B1BF2151B for ; Mon, 26 Oct 2020 23:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756634; bh=ETrYZXhGbgWZPcYXP/XlHrX/cKmPMpYgRFx8fNASlJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GCRTBYmax33eopJFOSNhcW0BaaIvFV0QJoSmpELTEPTNL12pmpgXBXolxxlWHKDbb RjTnVLWmYD6vAgER6qqA7zl28HjIIi3jwdzIQyL+Ktn3/zt67bLi+0prYIwt6zDjrI Q475NA2fRG0/4oHnGT5+N2rButIkmc/WCJCHZybI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436709AbgJZX5M (ORCPT ); Mon, 26 Oct 2020 19:57:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:32788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2410560AbgJZXyw (ORCPT ); Mon, 26 Oct 2020 19:54:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CFDF4221FC; Mon, 26 Oct 2020 23:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756491; bh=ETrYZXhGbgWZPcYXP/XlHrX/cKmPMpYgRFx8fNASlJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EjfToXzfAx1Wwd5SbV1fo0b+gmsyHqShvLa8bFujLXaqw+Lp4ffZFPObTsEa8yQ2/ IyUQne1WcMlXUIGSvBBOjuY0X4Nuiu5u6eYG2S/DNWVQbGtAL9WIzVZXKaKQVVxR5/ q/hODRv0qqz7NhHIxPRneDvKg6dcMpQiElmrJkMA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chao Leng , Sagi Grimberg , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.8 132/132] nvme-rdma: fix crash when connect rejected Date: Mon, 26 Oct 2020 19:52:04 -0400 Message-Id: <20201026235205.1023962-132-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026235205.1023962-1-sashal@kernel.org> References: <20201026235205.1023962-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Leng [ Upstream commit 43efdb8e870ee0f58633fd579aa5b5185bf5d39e ] A crash can happened when a connect is rejected. The host establishes the connection after received ConnectReply, and then continues to send the fabrics Connect command. If the controller does not receive the ReadyToUse capsule, host may receive a ConnectReject reply. Call nvme_rdma_destroy_queue_ib after the host received the RDMA_CM_EVENT_REJECTED event. Then when the fabrics Connect command times out, nvme_rdma_timeout calls nvme_rdma_complete_rq to fail the request. A crash happenes due to use after free in nvme_rdma_complete_rq. nvme_rdma_destroy_queue_ib is redundant when handling the RDMA_CM_EVENT_REJECTED event as nvme_rdma_destroy_queue_ib is already called in connection failure handler. Signed-off-by: Chao Leng Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/rdma.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 4a0bc8927048a..99f627b0053f7 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1900,7 +1900,6 @@ static int nvme_rdma_cm_handler(struct rdma_cm_id *cm_id, complete(&queue->cm_done); return 0; case RDMA_CM_EVENT_REJECTED: - nvme_rdma_destroy_queue_ib(queue); cm_error = nvme_rdma_conn_rejected(queue, ev); break; case RDMA_CM_EVENT_ROUTE_ERROR: -- 2.25.1