diff options
| author | Julien Grall <julien.grall@arm.com> | 2016-05-31 12:41:22 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2016-06-03 10:16:21 +0100 |
| commit | 0f254c7671e851243412bce6c2e618732831d0f8 (patch) | |
| tree | 89765603a9ca1a9f88830b09d6244f693398aea8 /drivers/perf | |
| parent | 121323ae668e456d0ed328f5b77c22bf5dd8e4de (diff) | |
| download | op-kernel-dev-0f254c7671e851243412bce6c2e618732831d0f8.zip op-kernel-dev-0f254c7671e851243412bce6c2e618732831d0f8.tar.gz | |
drivers/perf: arm_pmu: Defer the setting of __oprofile_cpu_pmu
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).
Cc: <stable@vger.kernel.org>
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>
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 6401f0c..95614d2 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -992,9 +992,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))) { @@ -1030,6 +1027,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); |
