Unverified Commit 2d8c9961 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8484 scsi: megaraid_sas: Fix resource leak in case of probe failure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VCZNEJQDJKNJH4GRHKZZAPAQZEJYM7A6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RQ71 
 
Link:https://gitee.com/openeuler/kernel/pulls/8484

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents bc352912 b0a166e9

drivers/scsi/megaraid/megaraid_sas_base.c

+10 −0
Original line number Diff line number Diff line
@@ -6620,11 +6620,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);
@@ -6632,8 +6637,13 @@ 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);

fail_init_mfi:

	scsi_host_put(host);

fail_alloc_instance:

drivers/scsi/megaraid/megaraid_sas_fusion.c

+1 −0
Original line number Diff line number Diff line
@@ -4857,6 +4857,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;

		}

	}