lkml.org 
[lkml]   [2021]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 040/114] scsi: megaraid_sas: Fix resource leak in case of probe failure
    Date
    From: Chandrakanth Patil <chandrakanth.patil@broadcom.com>

    [ Upstream commit b5438f48fdd8e1c3f130d32637511efd32038152 ]

    The driver doesn't clean up all the allocated resources properly when
    scsi_add_host(), megasas_start_aen() function fails during the PCI device
    probe.

    Clean up all those resources.

    Link: https://lore.kernel.org/r/20210528131307.25683-3-chandrakanth.patil@broadcom.com
    Signed-off-by: Chandrakanth Patil <chandrakanth.patil@broadcom.com>
    Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/megaraid/megaraid_sas_base.c | 13 +++++++++++++
    drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 +
    2 files changed, 14 insertions(+)

    diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
    index 4d4e9dbe5193..e4004d3353b8 100644
    --- a/drivers/scsi/megaraid/megaraid_sas_base.c
    +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
    @@ -7545,11 +7545,16 @@ static int megasas_probe_one(struct pci_dev *pdev,
    return 0;

    fail_start_aen:
    + instance->unload = 1;
    + scsi_remove_host(instance->host);
    fail_io_attach:
    megasas_mgmt_info.count--;
    megasas_mgmt_info.max_index--;
    megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = NULL;

    + if (instance->requestorId && !instance->skip_heartbeat_timer_del)
    + del_timer_sync(&instance->sriov_heartbeat_timer);
    +
    instance->instancet->disable_intr(instance);
    megasas_destroy_irqs(instance);

    @@ -7557,8 +7562,16 @@ static int megasas_probe_one(struct pci_dev *pdev,
    megasas_release_fusion(instance);
    else
    megasas_release_mfi(instance);
    +
    if (instance->msix_vectors)
    pci_free_irq_vectors(instance->pdev);
    + instance->msix_vectors = 0;
    +
    + if (instance->fw_crash_state != UNAVAILABLE)
    + megasas_free_host_crash_buffer(instance);
    +
    + if (instance->adapter_type != MFI_SERIES)
    + megasas_fusion_stop_watchdog(instance);
    fail_init_mfi:
    scsi_host_put(host);
    fail_alloc_instance:
    diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
    index 2221175ae051..8bf7db921758 100644
    --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
    +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
    @@ -5266,6 +5266,7 @@ megasas_alloc_fusion_context(struct megasas_instance *instance)
    if (!fusion->log_to_span) {
    dev_err(&instance->pdev->dev, "Failed from %s %d\n",
    __func__, __LINE__);
    + kfree(instance->ctrl_context);
    return -ENOMEM;
    }
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-10 04:39    [W:4.474 / U:0.648 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site