diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-16 18:57:22 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-09-16 18:57:22 -0400 |
| commit | 5facac77676ec9e5794c59e82b0a5a13bba7ad93 (patch) | |
| tree | a0136dce16c89942a3408e79090b7efefd42dafe | |
| parent | 31de0c302eca13280e3411c670f26adeb921ef63 (diff) | |
| download | longterm-queue-5.2-5facac77676ec9e5794c59e82b0a5a13bba7ad93.tar.gz | |
scsi: lpfc: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch b/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch index b9133f81..355f7321 100644 --- a/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch +++ b/queue/scsi-lpfc-nvmet-Avoid-hang-use-after-free-again-when.patch @@ -1,4 +1,4 @@ -From af6de8c60fe9433afa73cea6fcccdccd98ad3e5e Mon Sep 17 00:00:00 2001 +From b81306bd347f0a9ed2442277386b9c729623395e Mon Sep 17 00:00:00 2001 From: "Ewan D. Milne" <emilne@redhat.com> Date: Wed, 29 Jul 2020 19:10:11 -0400 Subject: [PATCH] scsi: lpfc: nvmet: Avoid hang / use-after-free again when @@ -25,18 +25,18 @@ Signed-off-by: Ewan D. Milne <emilne@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c -index a4430aeeb04a..d4ade7cdb93a 100644 +index d74bfd264495..8a93dfa79297 100644 --- a/drivers/scsi/lpfc/lpfc_nvmet.c +++ b/drivers/scsi/lpfc/lpfc_nvmet.c -@@ -2110,7 +2110,7 @@ lpfc_nvmet_destroy_targetport(struct lpfc_hba *phba) +@@ -1723,7 +1723,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_TRACE_EVENT, - "6179 Unreg targetport x%px timeout " + lpfc_printf_log(phba, KERN_ERR, LOG_NVME, + "6179 Unreg targetport %p timeout " -- 2.27.0 |