public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Ewan D. Milne" <emilne@redhat.com>,
	"Martin K . Petersen" <martin.petersen@oracle.com>,
	Sasha Levin <sashal@kernel.org>,
	linux-scsi@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 43/65] scsi: lpfc: nvme: avoid hang / use-after-free when destroying localport
Date: Thu, 14 Feb 2019 21:10:59 -0500	[thread overview]
Message-ID: <20190215021121.177674-43-sashal@kernel.org> (raw)
In-Reply-To: <20190215021121.177674-1-sashal@kernel.org>

From: "Ewan D. Milne" <emilne@redhat.com>

[ Upstream commit 7961cba6f7d8215fa632df3d220e5154bb825249 ]

We cannot wait on a completion object in the lpfc_nvme_lport structure in
the _destroy_localport() code path because the NVMe/fc transport will free
that structure immediately after the .localport_delete() callback.  This
results in a use-after-free, and a hang if slub_debug=FZPU is enabled.

Fix this by putting the completion on the stack.

Signed-off-by: Ewan D. Milne <emilne@redhat.com>
Acked-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/scsi/lpfc/lpfc_nvme.c | 16 +++++++++-------
 drivers/scsi/lpfc/lpfc_nvme.h |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index 918ae18ef8a8..ca62117a2d13 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -297,7 +297,8 @@ lpfc_nvme_localport_delete(struct nvme_fc_local_port *localport)
 			 lport);
 
 	/* release any threads waiting for the unreg to complete */
-	complete(&lport->lport_unreg_done);
+	if (lport->vport->localport)
+		complete(lport->lport_unreg_cmp);
 }
 
 /* lpfc_nvme_remoteport_delete
@@ -2556,7 +2557,8 @@ lpfc_nvme_create_localport(struct lpfc_vport *vport)
  */
 void
 lpfc_nvme_lport_unreg_wait(struct lpfc_vport *vport,
-			   struct lpfc_nvme_lport *lport)
+			   struct lpfc_nvme_lport *lport,
+			   struct completion *lport_unreg_cmp)
 {
 #if (IS_ENABLED(CONFIG_NVME_FC))
 	u32 wait_tmo;
@@ -2568,8 +2570,7 @@ lpfc_nvme_lport_unreg_wait(struct lpfc_vport *vport,
 	 */
 	wait_tmo = msecs_to_jiffies(LPFC_NVME_WAIT_TMO * 1000);
 	while (true) {
-		ret = wait_for_completion_timeout(&lport->lport_unreg_done,
-						  wait_tmo);
+		ret = wait_for_completion_timeout(lport_unreg_cmp, wait_tmo);
 		if (unlikely(!ret)) {
 			lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME_IOERR,
 					 "6176 Lport %p Localport %p wait "
@@ -2603,12 +2604,12 @@ lpfc_nvme_destroy_localport(struct lpfc_vport *vport)
 	struct lpfc_nvme_lport *lport;
 	struct lpfc_nvme_ctrl_stat *cstat;
 	int ret;
+	DECLARE_COMPLETION_ONSTACK(lport_unreg_cmp);
 
 	if (vport->nvmei_support == 0)
 		return;
 
 	localport = vport->localport;
-	vport->localport = NULL;
 	lport = (struct lpfc_nvme_lport *)localport->private;
 	cstat = lport->cstat;
 
@@ -2619,13 +2620,14 @@ lpfc_nvme_destroy_localport(struct lpfc_vport *vport)
 	/* lport's rport list is clear.  Unregister
 	 * lport and release resources.
 	 */
-	init_completion(&lport->lport_unreg_done);
+	lport->lport_unreg_cmp = &lport_unreg_cmp;
 	ret = nvme_fc_unregister_localport(localport);
 
 	/* Wait for completion.  This either blocks
 	 * indefinitely or succeeds
 	 */
-	lpfc_nvme_lport_unreg_wait(vport, lport);
+	lpfc_nvme_lport_unreg_wait(vport, lport, &lport_unreg_cmp);
+	vport->localport = NULL;
 	kfree(cstat);
 
 	/* Regardless of the unregister upcall response, clear
diff --git a/drivers/scsi/lpfc/lpfc_nvme.h b/drivers/scsi/lpfc/lpfc_nvme.h
index cfd4719be25c..b234d0298994 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.h
+++ b/drivers/scsi/lpfc/lpfc_nvme.h
@@ -50,7 +50,7 @@ struct lpfc_nvme_ctrl_stat {
 /* Declare nvme-based local and remote port definitions. */
 struct lpfc_nvme_lport {
 	struct lpfc_vport *vport;
-	struct completion lport_unreg_done;
+	struct completion *lport_unreg_cmp;
 	/* Add stats counters here */
 	struct lpfc_nvme_ctrl_stat *cstat;
 	atomic_t fc4NvmeLsRequests;
-- 
2.19.1


  parent reply	other threads:[~2019-02-15  2:12 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-15  2:10 [PATCH AUTOSEL 4.19 01/65] drm/msm: Unblock writer if reader closes file Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 02/65] ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 03/65] ALSA: compress: prevent potential divide by zero bugs Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 04/65] ASoC: Variable "val" in function rt274_i2c_probe() could be uninitialized Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 05/65] clk: tegra: dfll: Fix a potential Oop in remove() Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 06/65] clk: sysfs: fix invalid JSON in clk_dump Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 07/65] clk: vc5: Abort clock configuration without upstream clock Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 08/65] thermal: int340x_thermal: Fix a NULL vs IS_ERR() check Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 09/65] usb: dwc3: gadget: synchronize_irq dwc irq in suspend Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 10/65] usb: dwc3: gadget: Fix the uninitialized link_state when udc starts Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 11/65] usb: gadget: Potential NULL dereference on allocation error Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 12/65] selftests: rtc: rtctest: fix alarm tests Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 13/65] selftests: rtc: rtctest: add alarm test on minute boundary Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 14/65] genirq: Make sure the initial affinity is not empty Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 15/65] x86/mm/mem_encrypt: Fix erroneous sizeof() Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 16/65] ASoC: rt5682: Fix PLL source register definitions Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 17/65] ASoC: dapm: change snprintf to scnprintf for possible overflow Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 18/65] ASoC: imx-audmux: " Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 19/65] selftests/vm/gup_benchmark.c: match gup struct to kernel Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 20/65] phy: ath79-usb: Fix the power on error path Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 21/65] phy: ath79-usb: Fix the main reset name to match the DT binding Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 22/65] selftests: seccomp: use LDLIBS instead of LDFLAGS Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 23/65] selftests: gpio-mockup-chardev: Check asprintf() for error Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 24/65] irqchip/gic-v3-mbi: Fix uninitialized mbi_lock Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 25/65] ARC: fix __ffs return value to avoid build warnings Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 26/65] ARC: show_regs: lockdep: avoid page allocator Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 27/65] drivers: thermal: int340x_thermal: Fix sysfs race condition Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 28/65] staging: rtl8723bs: Fix build error with Clang when inlining is disabled Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 29/65] mac80211: fix miscounting of ttl-dropped frames Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 30/65] sched/wait: Fix rcuwait_wake_up() ordering Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 31/65] sched/wake_q: Fix wakeup ordering for wake_q Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 32/65] futex: Fix (possible) missed wakeup Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 33/65] locking/rwsem: " Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 34/65] libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive() Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 35/65] drm/amd/powerplay: OD setting fix on Vega10 Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 36/65] tty: serial: qcom_geni_serial: Allow mctrl when flow control is disabled Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 37/65] serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 38/65] drm/sun4i: hdmi: Fix usage of TMDS clock Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 39/65] staging: android: ion: Support cpu access during dma_buf_detach Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 40/65] direct-io: allow direct writes to empty inodes Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 41/65] block: cover another queue enter recursion via BIO_QUEUE_ENTERED Sasha Levin
2019-02-15  2:10 ` [PATCH AUTOSEL 4.19 42/65] writeback: synchronize sync(2) against cgroup writeback membership switches Sasha Levin
2019-02-15  2:10 ` Sasha Levin [this message]
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 44/65] scsi: lpfc: nvmet: avoid hang / use-after-free when destroying targetport Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 45/65] scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state() Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 46/65] net: altera_tse: fix connect_local_phy error path Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 47/65] hv_netvsc: Fix ethtool change hash key error Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 48/65] hv_netvsc: Refactor assignments of struct netvsc_device_info Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 49/65] hv_netvsc: Fix hash key value reset after other ops Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 50/65] sfc: suppress duplicate nvmem partition types in efx_ef10_mtd_probe Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 51/65] ax25: fix possible use-after-free Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 52/65] nvme-rdma: fix timeout handler Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 53/65] nvme-multipath: drop optimization for static ANA group IDs Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 54/65] drm/msm: Fix A6XX support for opp-level Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 55/65] CIFS: Do not assume one credit for async responses Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 56/65] net: usb: asix: ax88772_bind return error when hw_reset fail Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 57/65] net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 58/65] ibmveth: Do not process frames after calling napi_reschedule Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 59/65] mac80211: don't initiate TDLS connection if station is not associated to AP Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 60/65] mac80211: Add attribute aligned(2) to struct 'action' Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 61/65] cfg80211: extend range deviation for DMG Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 62/65] svm: Fix AVIC incomplete IPI emulation Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 63/65] KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1 Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 64/65] kvm: selftests: Fix region overlap check in kvm_util Sasha Levin
2019-02-15  2:11 ` [PATCH AUTOSEL 4.19 65/65] Revert "block: cover another queue enter recursion via BIO_QUEUE_ENTERED" 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=20190215021121.177674-43-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=emilne@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=stable@vger.kernel.org \
    /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