Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf: arm_spe: handle devm_kasprintf() failure

devm_kasprintf() may return NULL on failure of internal allocation
thus the assignment to 'name' is not safe if unchecked. If NULL
is passed in for name then perf_pmu_register() would not fail
but rather silently jump to skip_type which is not the intent
here. As perf_pmu_register() may also return -ENOMEM returning
-ENOMEM in the (unlikely) failure case of devm_kasprintf() should
be fine here as well.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Fixes: d5d9696b0380 ("drivers/perf: Add support for ARMv8.2 Statistical Profiling Extension")
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
[will: reworded error message]
Signed-off-by: Will Deacon <will.deacon@arm.com>

authored by

Nicholas Mc Guire and committed by
Will Deacon
754a58db cbb72a3c

+5
+5
drivers/perf/arm_spe_pmu.c
··· 927 927 928 928 idx = atomic_inc_return(&pmu_idx); 929 929 name = devm_kasprintf(dev, GFP_KERNEL, "%s_%d", PMUNAME, idx); 930 + if (!name) { 931 + dev_err(dev, "failed to allocate name for pmu %d\n", idx); 932 + return -ENOMEM; 933 + } 934 + 930 935 return perf_pmu_register(&spe_pmu->pmu, name, -1); 931 936 } 932 937