Skip to content

Commit fe9a711

Browse files
Ewan D. Milnegregkh
authored andcommitted
scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport
[ Upstream commit af6de8c ] 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 2a0fb34 ("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: 2a0fb34 ("scsi: lpfc: Correct localport timeout duration error") Reviewed-by: James Smart <james.smart@broadcom.com> Signed-off-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent ff62a41 commit fe9a711

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/scsi/lpfc/lpfc_nvmet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba)
17121712
}
17131713
tgtp->tport_unreg_cmp = &tport_unreg_cmp;
17141714
nvmet_fc_unregister_targetport(phba->targetport);
1715-
if (!wait_for_completion_timeout(tgtp->tport_unreg_cmp,
1715+
if (!wait_for_completion_timeout(&tport_unreg_cmp,
17161716
msecs_to_jiffies(LPFC_NVMET_WAIT_TMO)))
17171717
lpfc_printf_log(phba, KERN_ERR, LOG_NVME,
17181718
"6179 Unreg targetport %p timeout "

0 commit comments

Comments
 (0)