Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da14c05a authored by Ewan D. Milne's avatar Ewan D. Milne Committed by Greg Kroah-Hartman
Browse files

scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport 

[ Upstream commit af6de8c60fe9433afa73cea6fcccdccd98ad3e5e ]

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

An earlier fix put put the completion on the stack, but commit 2a0fb340
("scsi: lpfc: Correct localport timeout duration error") subsequently
changed the code to reference the completion through a pointer in the
object rather than the local stack variable.  Fix this by using the stack
variable directly.

Link: https://lore.kernel.org/r/20200729231011.13240-1-emilne@redhat.com


Fixes: 2a0fb340 ("scsi: lpfc: Correct localport timeout duration error")
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c9220ff3

drivers/scsi/lpfc/lpfc_nvmet.c

+1 −1
Original line number Diff line number Diff line
@@ -1923,7 +1923,7 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba) 
		}

		tgtp->tport_unreg_cmp = &tport_unreg_cmp;

		nvmet_fc_unregister_targetport(phba->targetport);

		if (!wait_for_completion_timeout(tgtp->tport_unreg_cmp,

		if (!wait_for_completion_timeout(&tport_unreg_cmp,

					msecs_to_jiffies(LPFC_NVMET_WAIT_TMO)))

			lpfc_printf_log(phba, KERN_ERR, LOG_NVME,

					"6179 Unreg targetport x%px timeout "