From 1417282f8023adb580372d81ecf5c08670b848a7 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mar 28 2024 14:37:45 +0000 Subject: scsi: lpfc: Correct size for cmdwqe/rspwqe for memset() (bsc#1221777). --- diff --git a/patches.suse/scsi-lpfc-Correct-size-for-cmdwqe-rspwqe-for-memset.patch b/patches.suse/scsi-lpfc-Correct-size-for-cmdwqe-rspwqe-for-memset.patch new file mode 100644 index 0000000..5202ac0 --- /dev/null +++ b/patches.suse/scsi-lpfc-Correct-size-for-cmdwqe-rspwqe-for-memset.patch @@ -0,0 +1,36 @@ +From: Muhammad Usama Anjum +Date: Mon, 4 Mar 2024 14:11:19 +0500 +Subject: scsi: lpfc: Correct size for cmdwqe/rspwqe for memset() +Patch-mainline: Queued in subsystem maintainer repository +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git +Git-commit: 16cc2ba71b9f6440805aef7f92ba0f031f79b765 +References: bsc#1221777 + +The cmdwqe and rspwqe are of type lpfc_wqe128. They should be memset() with +the same type. + +Fixes: 61910d6a5243 ("scsi: lpfc: SLI path split: Refactor CT paths") +Signed-off-by: Muhammad Usama Anjum +Link: https://lore.kernel.org/r/20240304091119.847060-1-usama.anjum@collabora.com +Reviewed-by: Justin Tee +Signed-off-by: Martin K. Petersen +Acked-by: Daniel Wagner +--- + drivers/scsi/lpfc/lpfc_bsg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/scsi/lpfc/lpfc_bsg.c ++++ b/drivers/scsi/lpfc/lpfc_bsg.c +@@ -3169,10 +3169,10 @@ lpfc_bsg_diag_loopback_run(struct bsg_jo + } + + cmdwqe = &cmdiocbq->wqe; +- memset(cmdwqe, 0, sizeof(union lpfc_wqe)); ++ memset(cmdwqe, 0, sizeof(*cmdwqe)); + if (phba->sli_rev < LPFC_SLI_REV4) { + rspwqe = &rspiocbq->wqe; +- memset(rspwqe, 0, sizeof(union lpfc_wqe)); ++ memset(rspwqe, 0, sizeof(*rspwqe)); + } + + INIT_LIST_HEAD(&head); diff --git a/series.conf b/series.conf index f3a708f..e967b87 100644 --- a/series.conf +++ b/series.conf @@ -20056,6 +20056,7 @@ # mkp/scsi queue patches.suse/scsi-lpfc-Correct-size-for-wqe-for-memset.patch + patches.suse/scsi-lpfc-Correct-size-for-cmdwqe-rspwqe-for-memset.patch patches.suse/scsi-qla2xxx-Prevent-command-send-on-chip-reset.patch patches.suse/scsi-qla2xxx-Fix-N2N-stuck-connection.patch patches.suse/scsi-qla2xxx-Split-FCE-EFT-trace-control.patch