From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8F41492E5D for ; Wed, 9 Sep 2026 00:25:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788913522; cv=none; b=IIGYAz7GWL/VzluTqo7oMcFZXuakgXWZSCGRfKvitGv0A21fRzEIdktho1ULmIW0/SL0XPbGBYaALtYGbTdiod7x2SXQ9U0Ml8d57twfqwuPruHVDMDAHsEsZQgXGCY1anCdQjwYqOWdK7xH4rUgM2tKFa+ZxwF6MvBNE2UYUg8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788913522; c=relaxed/simple; bh=TL5cGBNF9y9MLrbJm4U5rWjMuWNsdei3Z0PcjUIoUiY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a308nJmRRB7ajk/WbfFyHvmUPokA+q4vGrdqsD9AszN2Szzo8enlT88gVOf8diwFMV0Ry+pjEGp3H6C76nBZvM7Jo8s/Vty7X+Nu52BysLB/hdJbhFn7CRXfPxRVqSgE1rLYwdbxf+dVGHWuouM4ALriIN2Qj46IUc2cfmGcgUA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YmeJFZ+b; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YmeJFZ+b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B68F1F00A3E; Wed, 9 Sep 2026 00:25:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788913520; bh=rPtJ2359vJv/kjNCDTpOnA5A7VXInNVBSrIbrGf2jVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YmeJFZ+bvyHSbV4ztLWSHZImL+RLs7wsAwTToedKEUx+uf/HoSaij3DW/hPDnyWt0 xHD9BsH1MPCqfmvqlJGgdKl4/MumDcS4BnuBykNbKB2dLGpkVS7u8QfawhPyoLmE8D ENzhYBjY5LngR5hJwagbNH0peGSEiSLuBr2IW6lpV7rUQz8Y+ZiRExubmwjDx4nqqE V74BHhmlF9QEaT+I+7uR1WTskoQXS5PLtGkQLnbwHEjndonhF1JLjKXfbZKi1MfeTX nF5VcFmPzzQbp0X2nB5Brl6SBmuokXHkvSF76eENhXaxD9ZS4vrSiwirywXeXIIMpx mXUmLAC4pbPVg== From: Sasha Levin To: stable@vger.kernel.org Cc: Chuck Lever , Jeff Layton , Sasha Levin Subject: [PATCH 6.18.y 2/2] svcrdma: Clear sc_cm_id when ADDR_CHANGE replacement fails Date: Tue, 8 Sep 2026 20:25:17 -0400 Message-ID: <20260909002517.726510-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260909002517.726510-1-sashal@kernel.org> References: <2026090325-lushness-making-8377@gregkh> <20260909002517.726510-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever [ Upstream commit 01500306e1d50de7ca7a2cdcdfa28ac0523eb747 ] When svc_rdma_listen_handler() handles RDMA_CM_EVENT_ADDR_CHANGE, it creates a replacement listener cm_id and returns 1, telling the CM core to destroy the old one. If the replacement allocation fails, sc_cm_id still points at the old cm_id that the CM core is about to destroy. Any subsequent dereference of sc_cm_id -- such as svc_rdma_detach()'s rdma_disconnect() call -- is a use-after-free. NULL sc_cm_id on the failure path and guard svc_rdma_detach()'s rdma_disconnect() call against NULL so that the listener can be torn down safely when the server shuts down. Fixes: d1b586e75ec6 ("svcrdma: Handle ADDR_CHANGE CM event properly") Cc: stable@vger.kernel.org Acked-by: Jeff Layton Link: https://patch.msgid.link/20260527-rdma-follow-on-v1-5-1b09bd87b6cd@oracle.com Signed-off-by: Chuck Lever [ added the missing sc_cm_id NULL guard to the existing __svc_rdma_free() cleanup worker. ] Signed-off-by: Sasha Levin --- net/sunrpc/xprtrdma/svc_rdma_transport.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index c8d994272f6f0..aa02c47ae5734 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -311,6 +311,7 @@ static int svc_rdma_listen_handler(struct rdma_cm_id *cma_id, if (IS_ERR(listen_id)) { pr_err("Listener dead, address change failed for device %s\n", cma_id->device->name); + cma_xprt->sc_cm_id = NULL; } else cma_xprt->sc_cm_id = listen_id; return 1; @@ -610,14 +611,20 @@ static void svc_rdma_detach(struct svc_xprt *xprt) struct svcxprt_rdma *rdma = container_of(xprt, struct svcxprt_rdma, sc_xprt); - rdma_disconnect(rdma->sc_cm_id); + if (rdma->sc_cm_id) + rdma_disconnect(rdma->sc_cm_id); } static void __svc_rdma_free(struct work_struct *work) { struct svcxprt_rdma *rdma = container_of(work, struct svcxprt_rdma, sc_work); - struct ib_device *device = rdma->sc_cm_id->device; + struct ib_device *device; + + if (!rdma->sc_cm_id) + goto out_free; + + device = rdma->sc_cm_id->device; /* This blocks until the Completion Queues are empty */ if (rdma->sc_qp && !IS_ERR(rdma->sc_qp)) @@ -648,6 +655,7 @@ static void __svc_rdma_free(struct work_struct *work) if (!test_bit(XPT_LISTENER, &rdma->sc_xprt.xpt_flags)) rpcrdma_rn_unregister(device, &rdma->sc_rn); +out_free: kfree(rdma); } -- 2.53.0