Skip to contentSkip to conversation

Patch "drivers/perf: arm_pmu: Defer the setting of __oprofile_cpu_pmu" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jun 18, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drivers/perf: arm_pmu: Defer the setting of __oprofile_cpu_pmu

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drivers-perf-arm_pmu-defer-the-setting-of-__oprofile_cpu_pmu.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0f254c7671e851243412bce6c2e618732831d0f8 Mon Sep 17 00:00:00 2001

From: Julien Grall <[email protected]>
Date: Tue, 31 May 2016 12:41:22 +0100
Subject: drivers/perf: arm_pmu: Defer the setting of __oprofile_cpu_pmu

From: Julien Grall <[email protected]>

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).

---
 drivers/perf/arm_pmu.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/perf/arm_pmu.c +3 -3
@@ -987,9 +987,6 @@ int arm_pmu_device_probe(struct platform
 
 	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
 	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);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/drivers-perf-arm_pmu-defer-the-setting-of-__oprofile_cpu_pmu.patch