Message ID | 20221108093725.1239563-1-mark.rutland@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm_pmu: acpi: handle allocation failure | expand |
On Tue, 8 Nov 2022 09:37:25 +0000, Mark Rutland wrote: > One of the failure paths in the arm_pmu ACPI code is missing an early > return, permitting a NULL pointer dereference upon a memory allocation > failure. > > Add the missing return. > > > [...] Applied to arm64 (for-next/acpi), thanks! [1/1] arm_pmu: acpi: handle allocation failure https://git.kernel.org/arm64/c/a8731264e5ce Cheers,
diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index a085e45b509e1..90815ad762ebc 100644 --- a/drivers/perf/arm_pmu_acpi.c +++ b/drivers/perf/arm_pmu_acpi.c @@ -333,6 +333,7 @@ int arm_pmu_acpi_probe(armpmu_init_fn init_fn) if (!pmu) { pr_warn("Unable to allocate PMU for CPU%d\n", cpu); + return -ENOMEM; } cpuid = per_cpu(cpu_data, cpu).reg_midr;
One of the failure paths in the arm_pmu ACPI code is missing an early return, permitting a NULL pointer dereference upon a memory allocation failure. Add the missing return. Fixes: fe40ffdb7656d1f9 ("arm_pmu: rework ACPI probing") Signed-off-by: Mark Rutland <mark.rutland@arm.com> Reported-by: Will Deacon <will@kernel.org> --- drivers/perf/arm_pmu_acpi.c | 1 + 1 file changed, 1 insertion(+)