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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBB11C4321E for ; Tue, 15 Feb 2022 15:31:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240078AbiBOPbb (ORCPT ); Tue, 15 Feb 2022 10:31:31 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:48904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240408AbiBOPbU (ORCPT ); Tue, 15 Feb 2022 10:31:20 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7B95C7E54; Tue, 15 Feb 2022 07:29:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 74A09615EE; Tue, 15 Feb 2022 15:29:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9341DC340EB; Tue, 15 Feb 2022 15:29:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644938957; bh=N8xWN7ToM0OURECdikdyOxvj33ARbCAMW08kXnXLDb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sP9AdkdNrA1w2V/btvWnBOtXToe4HTNG989LIVDO1w0ECDk8EZPS0UKdIZces9sRy L0Hkdj8yRtKvujNAc7MMAM3R+qJxllMDXIGTxSBBDml+6BKvtZ1jWcfUzZgOUT26Y7 lFjMQPHQ7/iZZqXkeHLkoL9pSrKdTMtcfFo+lzYD7ozIfZXgCdw7oBdKuFSBHnVacm kki4k6FSyHO+rSkjY3sh1NPkRcFQXs49KqXizrtQVoDcA7Wb3wQ7rfAUKkf2xnDB6/ QhBmjhgpYyLrRgDWiZQMAJT+4XgzECpGn7PH7AO2w6RqCngDCleakkU8isCtlNQSAN qAce4JZlU/CCA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Aloni , Chuck Lever , Anna Schumaker , Sasha Levin , trond.myklebust@hammerspace.com, anna@kernel.org, davem@davemloft.net, kuba@kernel.org, tom@talpey.com, linux-nfs@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 24/33] xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create Date: Tue, 15 Feb 2022 10:28:22 -0500 Message-Id: <20220215152831.580780-24-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215152831.580780-1-sashal@kernel.org> References: <20220215152831.580780-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: stable@vger.kernel.org From: Dan Aloni [ Upstream commit a9c10b5b3b67b3750a10c8b089b2e05f5e176e33 ] If there are failures then we must not leave the non-NULL pointers with the error value, otherwise `rpcrdma_ep_destroy` gets confused and tries free them, resulting in an Oops. Signed-off-by: Dan Aloni Acked-by: Chuck Lever Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- net/sunrpc/xprtrdma/verbs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index aaec3c9be8db6..1295f9ab839fd 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -438,6 +438,7 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt) IB_POLL_WORKQUEUE); if (IS_ERR(ep->re_attr.send_cq)) { rc = PTR_ERR(ep->re_attr.send_cq); + ep->re_attr.send_cq = NULL; goto out_destroy; } @@ -446,6 +447,7 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt) IB_POLL_WORKQUEUE); if (IS_ERR(ep->re_attr.recv_cq)) { rc = PTR_ERR(ep->re_attr.recv_cq); + ep->re_attr.recv_cq = NULL; goto out_destroy; } ep->re_receive_count = 0; @@ -484,6 +486,7 @@ static int rpcrdma_ep_create(struct rpcrdma_xprt *r_xprt) ep->re_pd = ib_alloc_pd(device, 0); if (IS_ERR(ep->re_pd)) { rc = PTR_ERR(ep->re_pd); + ep->re_pd = NULL; goto out_destroy; } -- 2.34.1