Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af2256d7 authored by Yuan Can's avatar Yuan Can Committed by Greg Kroah-Hartman
Browse files

perf: arm_dsu: Fix hotplug callback leak in dsu_pmu_init() 



[ Upstream commit facafab7611f7b872c6b9eeaff53461ef11f482e ]

dsu_pmu_init() won't remove the callback added by cpuhp_setup_state_multi()
when platform_driver_register() failed. Remove the callback by
cpuhp_remove_multi_state() in fail path.

Similar to the handling of arm_ccn_init() in commit 26242b33 ("bus:
arm-ccn: Prevent hotplug callback leak")

Fixes: 7520fa99 ("perf: ARM DynamIQ Shared Unit PMU support")
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
Acked-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20221115070207.32634-2-yuancan@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1e9186d6

drivers/perf/arm_dsu_pmu.c

+5 −1
Original line number Diff line number Diff line
@@ -816,7 +816,11 @@ static int __init dsu_pmu_init(void) 
	if (ret < 0)

		return ret;

	dsu_pmu_cpuhp_state = ret;

	return platform_driver_register(&dsu_pmu_driver);

	ret = platform_driver_register(&dsu_pmu_driver);

	if (ret)

		cpuhp_remove_multi_state(dsu_pmu_cpuhp_state);



	return ret;

}



static void __exit dsu_pmu_exit(void)