lkml.org 
[lkml]   [2016]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 65/68] perf header: Set nr_numa_nodes only when we parsed all the data
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    Sukadev reported segfault on releasing perf env's numa data. It's due
    to nr_numa_nodes being set no matter if the numa data gets parsed
    properly. The perf_env__exit crash the on releasing non existed data.

    Setting nr_numa_nodes only when data are parsed out properly.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Reported-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/n/tip-dt9c0zgkt4hybn2cr4xiawta@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/header.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
    index 43ded20f1edf..d89c9c7ef4e5 100644
    --- a/tools/perf/util/header.c
    +++ b/tools/perf/util/header.c
    @@ -1895,7 +1895,6 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse
    if (ph->needs_swap)
    nr = bswap_32(nr);

    - ph->env.nr_numa_nodes = nr;
    nodes = zalloc(sizeof(*nodes) * nr);
    if (!nodes)
    return -ENOMEM;
    @@ -1932,6 +1931,7 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse

    free(str);
    }
    + ph->env.nr_numa_nodes = nr;
    ph->env.numa_nodes = nodes;
    return 0;

    --
    2.7.4
    \
     
     \ /
      Last update: 2016-10-11 19:36    [W:2.849 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site