Skip to contentSkip to conversation

perf/core: Avoid NULL dereference in mux interval store

PATCH New Dapeng Mi 2 participants 4 messages Nov 2 perf events

lore
Share & tools
lore

Dapeng Mi

author
#0 lore raw

PATCH 1/2 perf/core: Avoid NULL dereference in mux interval store

perf_pmu_register() currently exposes the PMU device and its attributes before the per-CPU perf_cpu_pmu_context (cpc) has been allocated and initialized. That allows a race where user space writes perf_event_mux_interval_ms before cpc is ready, and perf_event_mux_interval_ms_store() dereferences it unconditionally.

Fix this by allocating and initializing the per-CPU PMU context before making the PMU attribute visible, and add a NULL check in perf_event_mux_interval_ms_store() to avoid dereferencing a missing cpc.

Fixes 62b856397927 ("perf: Add sysfs entry to adjust multiplexing interval per PMU")
---
 kernel/events/core.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
kernel/events/core.c +9 -6
index 7cdd02dba4f1..e088c31534bc 100644
@@ -12831,6 +12831,9 @@ perf_event_mux_interval_ms_store(struct device *dev,
 	if (timer == pmu->hrtimer_interval_ms)
 		return count;
 
+	if (!pmu->cpu_pmu_context)
+		return -ENODEV;
+
 	mutex_lock(&mux_interval_mutex);
 	pmu->hrtimer_interval_ms = timer;
 
@@ -13062,12 +13065,6 @@ int perf_pmu_register(struct pmu *_pmu, const char *name, int type)
 	pmu->type = pmu_type.id;
 	atomic_set(&pmu->exclusive_cnt, 0);
 
-	if (pmu_bus_running && !pmu->dev) {
-		int ret = pmu_dev_alloc(pmu);
-		if (ret)
-			return ret;
-	}
-
 	pmu->cpu_pmu_context = alloc_percpu(struct perf_cpu_pmu_context *);
 	if (!pmu->cpu_pmu_context)
 		return -ENOMEM;
@@ -13086,6 +13083,12 @@ int perf_pmu_register(struct pmu *_pmu, const char *name, int type)
 		__perf_mux_hrtimer_init(cpc, cpu);
 	}
 
+	if (pmu_bus_running && !pmu->dev) {
+		int ret = pmu_dev_alloc(pmu);
+		if (ret)
+			return ret;
+	}
+
 	if (!pmu->start_txn) {
 		if (pmu->pmu_enable) {
 			/*
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/2 perf/core: Cancel PMU mux hrtimer before freeing per-CPU context

perf_pmu_free() can free the PMU's per-CPU perf_cpu_pmu_context while the multiplexing hrtimer is still armed. Once the timer expires, it dereferences the freed cpc and can crash the kernel.

Cancel the multiplexing hrtimer before freeing the PMU context by adding a perf_mux_cancel_hrtimer() helper and invoking it from the PMU free path.

Fixes 8f4c4963d283 ("perf/core: Simplify the perf_pmu_register() error path")
---
 kernel/events/core.c | 7 +++++++
 1 file changed, 7 insertions(+)
kernel/events/core.c +7 -0
index e088c31534bc..54eb962ab6ff 100644
@@ -1316,6 +1316,12 @@ static void __perf_mux_hrtimer_init(struct perf_cpu_pmu_context *cpc, int cpu)
 		      HRTIMER_MODE_ABS_PINNED_HARD);
 }
 
+static void perf_mux_cancel_hrtimer(struct perf_cpu_pmu_context *cpc)
+{
+	cpc->hrtimer_active = 0;
+	hrtimer_cancel(&cpc->hrtimer);
+}
+
 static int perf_mux_hrtimer_restart(struct perf_cpu_pmu_context *cpc)
 {
 	struct hrtimer *timer = &cpc->hrtimer;
@@ -13024,6 +13030,7 @@ static void perf_pmu_free(struct pmu *pmu)
 			cpc = *per_cpu_ptr(pmu->cpu_pmu_context, cpu);
 			if (!cpc)
 				continue;
+			perf_mux_cancel_hrtimer(cpc);
 			if (cpc->epc.embedded) {
 				/* refcount managed */
 				put_pmu_ctx(&cpc->epc);
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 2/2] perf/core: Cancel PMU mux hrtimer before freeing per-CPU context

Sashiko has reviewed this patch and found no issues.
Quoted 4 lines

perf_pmu_free() can free the PMU's per-CPU perf_cpu_pmu_context while the multiplexing hrtimer is still armed. Once the timer expires, it dereferences the freed cpc and can crash the kernel.

Quoted 8 lines

Cancel the multiplexing hrtimer before freeing the PMU context by adding a perf_mux_cancel_hrtimer() helper and invoking it from the PMU free path.

Fixes 8f4c4963d283 ("perf/core: Simplify the perf_pmu_register() error path")

Sashiko has reviewed this patch and found no issues.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
#3 lore raw
In reply to Dapeng Mi
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines

perf_pmu_register() currently exposes the PMU device and its attributes before the per-CPU perf_cpu_pmu_context (cpc) has been allocated and initialized. That allows a race where user space writes perf_event_mux_interval_ms before cpc is ready, and perf_event_mux_interval_ms_store() dereferences it unconditionally.

Quoted 8 lines

Fix this by allocating and initializing the per-CPU PMU context before making the PMU attribute visible, and add a NULL check in perf_event_mux_interval_ms_store() to avoid dereferencing a missing cpc.

Fixes 62b856397927 ("perf: Add sysfs entry to adjust multiplexing interval per PMU")

Sashiko has reviewed this patch and found no issues.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1