lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 096/156] perf/x86/intel/uncore: Clean up error handling path of iio mapping
    Date
    From: Kan Liang <kan.liang@linux.intel.com>

    [ Upstream commit d4ba0b06306a70c99a43f9d452886a86e2d3bd26 ]

    The error handling path of iio mapping looks fragile. We already fixed
    one issue caused by it, commit f797f05d917f ("perf/x86/intel/uncore:
    Fix for iio mapping on Skylake Server"). Clean up the error handling
    path and make the code robust.

    Reported-by: gushengxian <gushengxian@yulong.com>
    Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Link: https://lkml.kernel.org/r/40e66cf9-398b-20d7-ce4d-433be6e08921@linux.intel.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/events/intel/uncore_snbep.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
    index 3a75a2c601c2..1f7bb4898a9d 100644
    --- a/arch/x86/events/intel/uncore_snbep.c
    +++ b/arch/x86/events/intel/uncore_snbep.c
    @@ -3789,11 +3789,11 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)
    /* One more for NULL. */
    attrs = kcalloc((uncore_max_dies() + 1), sizeof(*attrs), GFP_KERNEL);
    if (!attrs)
    - goto err;
    + goto clear_topology;

    eas = kcalloc(uncore_max_dies(), sizeof(*eas), GFP_KERNEL);
    if (!eas)
    - goto err;
    + goto clear_attrs;

    for (die = 0; die < uncore_max_dies(); die++) {
    sprintf(buf, "die%ld", die);
    @@ -3814,7 +3814,9 @@ err:
    for (; die >= 0; die--)
    kfree(eas[die].attr.attr.name);
    kfree(eas);
    +clear_attrs:
    kfree(attrs);
    +clear_topology:
    kfree(type->topology);
    clear_attr_update:
    type->attr_update = NULL;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-22 19:36    [W:2.423 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site