drivers: perf: marvell_cn10k: Fix hotplug callback leak in tad_pmu_init()
authorYuan Can <yuancan@huawei.com>
Tue, 15 Nov 2022 07:02:07 +0000 (07:02 +0000)
committerWill Deacon <will@kernel.org>
Tue, 15 Nov 2022 13:45:02 +0000 (13:45 +0000)
tad_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 26242b330093 ("bus:
arm-ccn: Prevent hotplug callback leak")

Fixes: 036a7584bede ("drivers: perf: Add LLC-TAD perf counter support")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Link: https://lore.kernel.org/r/20221115070207.32634-3-yuancan@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
drivers/perf/marvell_cn10k_tad_pmu.c

index 69c3050a4348b5792b70880e60d94a846aa46dfc..a1166afb370246cea880b6c08c290e0789b0a39e 100644 (file)
@@ -408,7 +408,11 @@ static int __init tad_pmu_init(void)
        if (ret < 0)
                return ret;
        tad_pmu_cpuhp_state = ret;
-       return platform_driver_register(&tad_pmu_driver);
+       ret = platform_driver_register(&tad_pmu_driver);
+       if (ret)
+               cpuhp_remove_multi_state(tad_pmu_cpuhp_state);
+
+       return ret;
 }
 
 static void __exit tad_pmu_exit(void)