scsi: mpt3sas: Replace a dynamic allocation with a local variable

mpt3sas_base.c:_base_update_diag_trigger_pages() allocates and fetches a
MPI2_CONFIG_PAGE_SASIOUNIT_1 struct (Mpi2SasIOUnitPage_t), but does not
include the terminal flexible array member in the struct size calculation,
fetch that member, or otherwise use that member in any way.

This dynamic allocation can be replaced with a local variable.

Signed-off-by: James Seo <james@equiv.tech>
Link: https://lore.kernel.org/r/20230806170604.16143-12-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_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index f83f9297e9fb5f4f0dbb115da2565c65ae200a29..8761bc58d965f0f6eb6776a4272ca856e8724463 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -5378,10 +5378,9 @@ _base_update_diag_trigger_pages(struct MPT3SAS_ADAPTER *ioc)
 static int _base_assign_fw_reported_qd(struct MPT3SAS_ADAPTER *ioc)
 {
        Mpi2ConfigReply_t mpi_reply;
-       Mpi2SasIOUnitPage1_t *sas_iounit_pg1 = NULL;
+       Mpi2SasIOUnitPage1_t sas_iounit_pg1;
        Mpi26PCIeIOUnitPage1_t pcie_iounit_pg1;
        u16 depth;
-       int sz;
        int rc = 0;
 
        ioc->max_wideport_qd = MPT3SAS_SAS_QUEUE_DEPTH;
@@ -5391,28 +5390,21 @@ static int _base_assign_fw_reported_qd(struct MPT3SAS_ADAPTER *ioc)
        if (!ioc->is_gen35_ioc)
                goto out;
        /* sas iounit page 1 */
-       sz = offsetof(Mpi2SasIOUnitPage1_t, PhyData);
-       sas_iounit_pg1 = kzalloc(sizeof(Mpi2SasIOUnitPage1_t), GFP_KERNEL);
-       if (!sas_iounit_pg1) {
-               pr_err("%s: failure at %s:%d/%s()!\n",
-                   ioc->name, __FILE__, __LINE__, __func__);
-               return rc;
-       }
        rc = mpt3sas_config_get_sas_iounit_pg1(ioc, &mpi_reply,
-           sas_iounit_pg1, sz);
+           &sas_iounit_pg1, sizeof(Mpi2SasIOUnitPage1_t));
        if (rc) {
                pr_err("%s: failure at %s:%d/%s()!\n",
                    ioc->name, __FILE__, __LINE__, __func__);
                goto out;
        }
 
-       depth = le16_to_cpu(sas_iounit_pg1->SASWideMaxQueueDepth);
+       depth = le16_to_cpu(sas_iounit_pg1.SASWideMaxQueueDepth);
        ioc->max_wideport_qd = (depth ? depth : MPT3SAS_SAS_QUEUE_DEPTH);
 
-       depth = le16_to_cpu(sas_iounit_pg1->SASNarrowMaxQueueDepth);
+       depth = le16_to_cpu(sas_iounit_pg1.SASNarrowMaxQueueDepth);
        ioc->max_narrowport_qd = (depth ? depth : MPT3SAS_SAS_QUEUE_DEPTH);
 
-       depth = sas_iounit_pg1->SATAMaxQDepth;
+       depth = sas_iounit_pg1.SATAMaxQDepth;
        ioc->max_sata_qd = (depth ? depth : MPT3SAS_SATA_QUEUE_DEPTH);
 
        /* pcie iounit page 1 */
@@ -5431,7 +5423,6 @@ out:
            "MaxWidePortQD: 0x%x MaxNarrowPortQD: 0x%x MaxSataQD: 0x%x MaxNvmeQD: 0x%x\n",
            ioc->max_wideport_qd, ioc->max_narrowport_qd,
            ioc->max_sata_qd, ioc->max_nvme_qd));
-       kfree(sas_iounit_pg1);
        return rc;
 }