From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dan Aloni <dan.aloni@vastdata.com>,
Chuck Lever <chuck.lever@oracle.com>,
Anna Schumaker <Anna.Schumaker@Netapp.com>,
Sasha Levin <sashal@kernel.org>,
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.16 24/34] xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create
Date: Tue, 15 Feb 2022 10:26:47 -0500 [thread overview]
Message-ID: <20220215152657.580200-24-sashal@kernel.org> (raw)
In-Reply-To: <20220215152657.580200-1-sashal@kernel.org>
From: Dan Aloni <dan.aloni@vastdata.com>
[ 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 <dan.aloni@vastdata.com>
Acked-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 3d3673ba9e1e5..2a2e1514ac79a 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -436,6 +436,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;
}
@@ -444,6 +445,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;
@@ -482,6 +484,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
next prev parent reply other threads:[~2022-02-15 15:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 15:26 [PATCH AUTOSEL 5.16 01/34] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 02/34] ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 03/34] phy: usb: Leave some clocks running during suspend Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 04/34] staging: vc04_services: Fix RCU dereference check Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 05/34] phy: phy-mtk-tphy: Fix duplicated argument in phy-mtk-tphy Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 06/34] usb: usb251xb: add boost-up property support Sasha Levin
2022-02-15 16:21 ` Greg Kroah-Hartman
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 07/34] irqchip/sifive-plic: Add missing thead,c900-plic match string Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 08/34] x86/bug: Merge annotate_reachable() into _BUG_FLAGS() asm Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 09/34] netfilter: conntrack: don't refresh sctp entries in closed state Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 10/34] ksmbd: fix same UniqueId for dot and dotdot entries Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 11/34] ksmbd: don't align last entry offset in smb2 query directory Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 12/34] arm64: dts: meson-gx: add ATF BL32 reserved-memory region Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 13/34] arm64: dts: meson-g12: " Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 14/34] arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 15/34] pidfd: fix test failure due to stack overflow on some arches Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 16/34] selftests: fixup build warnings in pidfd / clone3 tests Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 17/34] mm: io_uring: allow oom-killer from io_uring_setup Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 18/34] ACPI: PM: Revert "Only mark EC GPE for wakeup on Intel systems" Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 19/34] kconfig: let 'shell' return enough output for deep path names Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 20/34] scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 21/34] scsi: lpfc: Reduce log messages seen after firmware download Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 22/34] ata: libata-core: Disable TRIM on M88V29 Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 23/34] soc: aspeed: lpc-ctrl: Block error printing on probe defer cases Sasha Levin
2022-02-15 15:26 ` Sasha Levin [this message]
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 25/34] drm/rockchip: dw_hdmi: Do not leave clock enabled in error case Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 26/34] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 27/34] NFSD: Fix offset type in I/O trace points Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 28/34] display/amd: decrease message verbosity about watermarks table failure Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 29/34] drm/amdgpu: add utcl2_harvest to gc 10.3.1 Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 30/34] drm/amd/display: Cap pflip irqs per max otg number Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 31/34] drm/amd/display: fix yellow carp wm clamping Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 32/34] net: usb: qmi_wwan: Add support for Dell DW5829e Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 33/34] net: macb: Align the dma and coherent dma masks Sasha Levin
2022-02-15 15:26 ` [PATCH AUTOSEL 5.16 34/34] kconfig: fix failing to generate auto.conf Sasha Levin
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=20220215152657.580200-24-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Anna.Schumaker@Netapp.com \
--cc=anna@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=dan.aloni@vastdata.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tom@talpey.com \
--cc=trond.myklebust@hammerspace.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