diff --git a/blacklist.conf b/blacklist.conf index c062f6d..57f9346 100644 --- a/blacklist.conf +++ b/blacklist.conf @@ -669,3 +669,4 @@ c0518b21fba5351c8544a18c1bdf20b73088d5d9 # cleanup designed to break kABI f81fead027ecbb525c29d681eb95a222e76306a3 # correction in a comment only 2355370cd941cbb20882cc3f34460f9f2b8f9a18 # already have it as part of a different commit 7fce8d6eccbc31a561d07c79f359ad09f0424347 # already have it as part of a different commit +c798304470cab88723d895726d17fcb96472e0e9 # fixes code not present in mpi3mr driver diff --git a/patches.suse/scsi-mpi3mr-Fix-throttle_groups-memory-leak.patch b/patches.suse/scsi-mpi3mr-Fix-throttle_groups-memory-leak.patch new file mode 100644 index 0000000..b0b609c --- /dev/null +++ b/patches.suse/scsi-mpi3mr-Fix-throttle_groups-memory-leak.patch @@ -0,0 +1,34 @@ +From: Tomas Henzl +Date: Fri, 3 Mar 2023 00:43:31 +0100 +Subject: scsi: mpi3mr: Fix throttle_groups memory leak +Git-commit: f305a7b6ca21a665e8d0cf70b5936991a298c93c +Patch-mainline: v6.3-rc3 +References: git-fixes + +Add a missing kfree(). + +Fixes: f10af057325c ("scsi: mpi3mr: Resource Based Metering") +Signed-off-by: Tomas Henzl +Link: https://lore.kernel.org/r/20230302234336.25456-2-thenzl@redhat.com +Acked-by: Sathya Prakash Veerichetty +Signed-off-by: Martin K. Petersen +Acked-by: Lee Duncan +--- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c +index 29acf6111db3..514ccf29cd7f 100644 +--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c ++++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c +@@ -4389,6 +4389,9 @@ void mpi3mr_free_mem(struct mpi3mr_ioc *mrioc) + mrioc->pel_seqnum_virt = NULL; + } + ++ kfree(mrioc->throttle_groups); ++ mrioc->throttle_groups = NULL; ++ + kfree(mrioc->logdata_buf); + mrioc->logdata_buf = NULL; + + diff --git a/series.conf b/series.conf index 5d5044b..6810b1b 100644 --- a/series.conf +++ b/series.conf @@ -39398,6 +39398,7 @@ patches.suse/cifs-return-DFS-root-session-id-in-DebugData.patch patches.suse/cifs-use-DFS-root-session-instead-of-tcon-ses.patch patches.suse/scsi-mpt3sas-Fix-NULL-pointer-access-in-mpt3sas_transport_port_add.patch + patches.suse/scsi-mpi3mr-Fix-throttle_groups-memory-leak.patch patches.suse/scsi-core-Add-BLIST_NO_VPD_SIZE-for-some-VDASD.patch patches.suse/scsi-core-Fix-a-procfs-host-directory-removal-regression.patch patches.suse/drm-shmem-helper-Remove-another-errant-put-in-error-.patch