diff options
| author | Julien Grall <julien.grall@arm.com> | 2016-05-31 12:41:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-24 10:22:01 -0700 |
| commit | 711d9f5dd7ff4e386b865bb8f6357f805a55f92c (patch) | |
| tree | e57cb42d34b89e55d0aadff0b82e99717f06b287 /drivers/perf | |
| parent | 9ae6bfa44168a15674769027922cba52a530f3bd (diff) | |
| download | linux-stable-711d9f5dd7ff4e386b865bb8f6357f805a55f92c.tar.gz linux-stable-711d9f5dd7ff4e386b865bb8f6357f805a55f92c.tar.bz2 linux-stable-711d9f5dd7ff4e386b865bb8f6357f805a55f92c.zip | |
drivers/perf: arm_pmu: Defer the setting of __oprofile_cpu_pmu
commit 0f254c7671e851243412bce6c2e618732831d0f8 upstream.
The global variable __oprofile_cpu_pmu is set before the PMU is fully
initialized. If an error occurs before the end of the initialization,
the PMU will be freed and the variable will contain an invalid pointer.
This will result in a kernel crash when perf will be used.
Fix it by moving the setting of __oprofile_cpu_pmu when the PMU is fully
initialized (i.e when it is no longer possible to fail).
Signed-off-by: Julien Grall <julien.grall@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/perf')
| -rw-r--r-- | drivers/perf/arm_pmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index f70090897fdf..0e537fdc1d08 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -987,9 +987,6 @@ int arm_pmu_device_probe(struct platform_device *pdev, armpmu_init(pmu); - if (!__oprofile_cpu_pmu) - __oprofile_cpu_pmu = pmu; - pmu->plat_device = pdev; if (node && (of_id = of_match_node(of_table, pdev->dev.of_node))) { @@ -1025,6 +1022,9 @@ int arm_pmu_device_probe(struct platform_device *pdev, if (ret) goto out_destroy; + if (!__oprofile_cpu_pmu) + __oprofile_cpu_pmu = pmu; + pr_info("enabled with %s PMU driver, %d counters available\n", pmu->name, pmu->num_events); |