lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.20 098/304] perf: arm_spe: handle devm_kasprintf() failure
    Date
    From: Nicholas Mc Guire <hofrat@osadl.org>

    [ Upstream commit 754a58db6a556e6e5f5e32f3e84e7d67b5bf9c8e ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/perf/arm_spe_pmu.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
    index 54ec278d2fc4..e1a77b2de78a 100644
    --- a/drivers/perf/arm_spe_pmu.c
    +++ b/drivers/perf/arm_spe_pmu.c
    @@ -927,6 +927,11 @@ static int arm_spe_pmu_perf_init(struct arm_spe_pmu *spe_pmu)

    idx = atomic_inc_return(&pmu_idx);
    name = devm_kasprintf(dev, GFP_KERNEL, "%s_%d", PMUNAME, idx);
    + if (!name) {
    + dev_err(dev, "failed to allocate name for pmu %d\n", idx);
    + return -ENOMEM;
    + }
    +
    return perf_pmu_register(&spe_pmu->pmu, name, -1);
    }

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 16:48    [W:3.432 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site