Skip to content

Commit 5442867

Browse files
Karan Tilak Kumarmartinkpetersen
authored andcommitted
scsi: fnic: Test for memory allocation failure and return error code
Fix kernel test robot warning. Test for memory allocation failure, and free memory for queues allocated in a multiqueue and non-multiqueue scenario. Return appropriate error code. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/r/202412312347.FE4ZgEoM-lkp@intel.com/ Reported-by: Julia Lawall <julia.lawall@inria.fr> Closes: https://lore.kernel.org/r/202412312347.FE4ZgEoM-lkp@intel.com/ Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com> Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com> Reviewed-by: Gian Carlo Boffa <gcboffa@cisco.com> Reviewed-by: Arun Easi <aeasi@cisco.com> Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com> Link: https://lore.kernel.org/r/20250110091924.17729-1-kartilak@cisco.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 3986001 commit 5442867

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

drivers/scsi/fnic/fnic_main.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,14 @@ static void fnic_scsi_init(struct fnic *fnic)
582582
host->transportt = fnic_fc_transport;
583583
}
584584

585+
static void fnic_free_ioreq_tables_mq(struct fnic *fnic)
586+
{
587+
int hwq;
588+
589+
for (hwq = 0; hwq < fnic->wq_copy_count; hwq++)
590+
kfree(fnic->sw_copy_wq[hwq].io_req_table);
591+
}
592+
585593
static int fnic_scsi_drv_init(struct fnic *fnic)
586594
{
587595
struct Scsi_Host *host = fnic->host;
@@ -614,6 +622,11 @@ static int fnic_scsi_drv_init(struct fnic *fnic)
614622
fnic->sw_copy_wq[hwq].io_req_table =
615623
kzalloc((fnic->sw_copy_wq[hwq].ioreq_table_size + 1) *
616624
sizeof(struct fnic_io_req *), GFP_KERNEL);
625+
626+
if (!fnic->sw_copy_wq[hwq].io_req_table) {
627+
fnic_free_ioreq_tables_mq(fnic);
628+
return -ENOMEM;
629+
}
617630
}
618631

619632
dev_info(&fnic->pdev->dev, "fnic copy wqs: %d, Q0 ioreq table size: %d\n",
@@ -1060,6 +1073,7 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
10601073

10611074
err_out_free_stats_debugfs:
10621075
fnic_stats_debugfs_remove(fnic);
1076+
fnic_free_ioreq_tables_mq(fnic);
10631077
scsi_remove_host(fnic->host);
10641078
err_out_scsi_drv_init:
10651079
fnic_free_intr(fnic);

0 commit comments

Comments
 (0)