scsi: mpt3sas: Replace dynamic allocations with local variables

mpt3sas_scsih.c:_scsih_scan_for_devices_after_reset() allocates and fetches
a MPI2_CONFIG_PAGE_RAID_VOL_0 struct (Mpi2RaidVolPage0_t) and a
MPI2_CONFIG_PAGE_RAID_VOL_1 struct (Mpi2RaidVolPage1_t), but does not
include the terminal flexible array members in the struct size
calculations, fetch those members, or otherwise use those members in any
way.

These dynamic allocations can be replaced with local variables.

Signed-off-by: James Seo <james@equiv.tech>
Link: https://lore.kernel.org/r/20230806170604.16143-13-james@equiv.tech
Tested-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 0a720ce1383a2f3d2be8d8cbce8191639d5d4799..5037e24596d8d4669875b51cc18adacf59f6f47e 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -10370,8 +10370,8 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
        Mpi2ExpanderPage0_t expander_pg0;
        Mpi2SasDevicePage0_t sas_device_pg0;
        Mpi26PCIeDevicePage0_t pcie_device_pg0;
-       Mpi2RaidVolPage1_t *volume_pg1;
-       Mpi2RaidVolPage0_t *volume_pg0;
+       Mpi2RaidVolPage1_t volume_pg1;
+       Mpi2RaidVolPage0_t volume_pg0;
        Mpi2RaidPhysDiskPage0_t pd_pg0;
        Mpi2EventIrConfigElement_t element;
        Mpi2ConfigReply_t mpi_reply;
@@ -10386,16 +10386,6 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
        u8 retry_count;
        unsigned long flags;
 
-       volume_pg0 = kzalloc(sizeof(*volume_pg0), GFP_KERNEL);
-       if (!volume_pg0)
-               return;
-
-       volume_pg1 = kzalloc(sizeof(*volume_pg1), GFP_KERNEL);
-       if (!volume_pg1) {
-               kfree(volume_pg0);
-               return;
-       }
-
        ioc_info(ioc, "scan devices: start\n");
 
        _scsih_sas_host_refresh(ioc);
@@ -10505,7 +10495,7 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
        /* volumes */
        handle = 0xFFFF;
        while (!(mpt3sas_config_get_raid_volume_pg1(ioc, &mpi_reply,
-           volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {
+           &volume_pg1, MPI2_RAID_VOLUME_PGAD_FORM_GET_NEXT_HANDLE, handle))) {
                ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
                    MPI2_IOCSTATUS_MASK;
                if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {
@@ -10513,15 +10503,15 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
                                 ioc_status, le32_to_cpu(mpi_reply.IOCLogInfo));
                        break;
                }
-               handle = le16_to_cpu(volume_pg1->DevHandle);
+               handle = le16_to_cpu(volume_pg1.DevHandle);
                spin_lock_irqsave(&ioc->raid_device_lock, flags);
                raid_device = _scsih_raid_device_find_by_wwid(ioc,
-                   le64_to_cpu(volume_pg1->WWID));
+                   le64_to_cpu(volume_pg1.WWID));
                spin_unlock_irqrestore(&ioc->raid_device_lock, flags);
                if (raid_device)
                        continue;
                if (mpt3sas_config_get_raid_volume_pg0(ioc, &mpi_reply,
-                   volume_pg0, MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, handle,
+                   &volume_pg0, MPI2_RAID_VOLUME_PGAD_FORM_HANDLE, handle,
                     sizeof(Mpi2RaidVolPage0_t)))
                        continue;
                ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &
@@ -10531,17 +10521,17 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
                                 ioc_status, le32_to_cpu(mpi_reply.IOCLogInfo));
                        break;
                }
-               if (volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_OPTIMAL ||
-                   volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_ONLINE ||
-                   volume_pg0->VolumeState == MPI2_RAID_VOL_STATE_DEGRADED) {
+               if (volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_OPTIMAL ||
+                   volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_ONLINE ||
+                   volume_pg0.VolumeState == MPI2_RAID_VOL_STATE_DEGRADED) {
                        memset(&element, 0, sizeof(Mpi2EventIrConfigElement_t));
                        element.ReasonCode = MPI2_EVENT_IR_CHANGE_RC_ADDED;
-                       element.VolDevHandle = volume_pg1->DevHandle;
+                       element.VolDevHandle = volume_pg1.DevHandle;
                        ioc_info(ioc, "\tBEFORE adding volume: handle (0x%04x)\n",
-                                volume_pg1->DevHandle);
+                                volume_pg1.DevHandle);
                        _scsih_sas_volume_add(ioc, &element);
                        ioc_info(ioc, "\tAFTER adding volume: handle (0x%04x)\n",
-                                volume_pg1->DevHandle);
+                                volume_pg1.DevHandle);
                }
        }
 
@@ -10630,9 +10620,6 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc)
                         handle, (u64)le64_to_cpu(pcie_device_pg0.WWID));
        }
 
-       kfree(volume_pg0);
-       kfree(volume_pg1);
-
        ioc_info(ioc, "\tpcie devices: pcie end devices complete\n");
        ioc_info(ioc, "scan devices: complete\n");
 }