Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1498827

[PATCH 4/6] perf header: Set nr_numa_nodes only when we parsed all the data

Show all headers | View raw

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.

Reported-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-dt9c0zgkt4hybn2cr4xiawta@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] perf tools: Header and c2c fixes Jiri Olsa <jolsa@kernel.org> - 2016-10-11 14:20 +0200
  [PATCH 4/6] perf header: Set nr_numa_nodes only when we parsed all the data Jiri Olsa <jolsa@kernel.org> - 2016-10-11 14:20 +0200
  [PATCH 3/6] perf header: Display feature name on write failure Jiri Olsa <jolsa@kernel.org> - 2016-10-11 14:20 +0200
  [PATCH 0/6] tools lib: Add for_each_clear_bit macro Jiri Olsa <jolsa@redhat.com> - 2016-10-11 15:10 +0200

csiph-web