[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180810133614.9925-1-bevers@mesosphere.com>
Date: Fri, 10 Aug 2018 15:36:13 +0200
From: Benno Evers <bevers@...osphere.com>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Krister Johansen <kjlx@...pleofstupid.com>,
Benno Evers <bevers@...osphere.com>,
Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...hat.com>,
Namhyung Kim <namhyung@...nel.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH v2] perf tools: Check for null when copying nsinfo.
The argument to nsinfo__copy() was assumed to be valid, but some code paths
exist that will lead to NULL being passed.
In particular, running 'perf script -D' on a perf.data file containing an
PERF_RECORD_MMAP event associating the '[vdso]' dso with pid 0 earlier in
the event stream will lead to a segfault.
Since all calling code is already checking for a non-null return value,
just return NULL for this case as well.
Acked-by: Namhyung Kim <namhyung@...nel.org>
Signed-off-by: Benno Evers <bevers@...osphere.com>
---
Changes from v1:
Added Signed-off-by line.
tools/perf/util/namespaces.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/util/namespaces.c b/tools/perf/util/namespaces.c
index 5be021701f34..cf8bd123cf73 100644
--- a/tools/perf/util/namespaces.c
+++ b/tools/perf/util/namespaces.c
@@ -139,6 +139,9 @@ struct nsinfo *nsinfo__copy(struct nsinfo *nsi)
{
struct nsinfo *nnsi;
+ if (nsi == NULL)
+ return NULL;
+
nnsi = calloc(1, sizeof(*nnsi));
if (nnsi != NULL) {
nnsi->pid = nsi->pid;
--
2.17.1
Powered by blists - more mailing lists