Unverified Commit 8a68e94e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8364 perf: hisi: Fix use-after-free when register pmu fails 

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

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 028e5dcf b3e3720f

drivers/perf/hisilicon/hisi_uncore_pa_pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int hisi_pa_pmu_probe(struct platform_device *pdev) 
	ret = perf_pmu_register(&pa_pmu->pmu, name, -1);

	if (ret) {

		dev_err(pa_pmu->dev, "PMU register failed, ret = %d\n", ret);

		cpuhp_state_remove_instance(CPUHP_AP_PERF_ARM_HISI_PA_ONLINE,

		cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_HISI_PA_ONLINE,

						    &pa_pmu->node);

		return ret;

	}

drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static int hisi_sllc_pmu_probe(struct platform_device *pdev) 
	ret = perf_pmu_register(&sllc_pmu->pmu, name, -1);

	if (ret) {

		dev_err(sllc_pmu->dev, "PMU register failed, ret = %d\n", ret);

		cpuhp_state_remove_instance(CPUHP_AP_PERF_ARM_HISI_SLLC_ONLINE,

		cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_HISI_SLLC_ONLINE,

						    &sllc_pmu->node);

		return ret;

	}