From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934434AbcJQOw7 (ORCPT ); Mon, 17 Oct 2016 10:52:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52414 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933813AbcJQOwu (ORCPT ); Mon, 17 Oct 2016 10:52:50 -0400 Date: Mon, 17 Oct 2016 07:52:30 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, jolsa@kernel.org, hpa@zytor.com, wangnan0@huawei.com, sukadev@linux.vnet.ibm.com, adrian.hunter@intel.com, mingo@kernel.org Reply-To: jolsa@kernel.org, acme@redhat.com, wangnan0@huawei.com, hpa@zytor.com, adrian.hunter@intel.com, mingo@kernel.org, sukadev@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, tglx@linutronix.de, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf header: Set nr_numa_nodes only when we parsed all the data Git-Commit-ID: f957a5308dbbdf67aa4f8ac3233a61e802bd2373 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f957a5308dbbdf67aa4f8ac3233a61e802bd2373 Gitweb: http://git.kernel.org/tip/f957a5308dbbdf67aa4f8ac3233a61e802bd2373 Author: Jiri Olsa AuthorDate: Mon, 10 Oct 2016 09:56:32 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 13 Oct 2016 11:12:29 -0300 perf header: Set nr_numa_nodes only when we parsed all the data 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 Reported-by: Sukadev Bhattiprolu Cc: Adrian Hunter Cc: David Ahern Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-dt9c0zgkt4hybn2cr4xiawta@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 85dd0db..2f3eded 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;