Commit 3f4417d6 authored by Benno Evers's avatar Benno Evers Committed by Arnaldo Carvalho de Melo

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.
Signed-off-by: default avatarBenno Evers <bevers@mesosphere.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Krister Johansen <kjlx@templeofstupid.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180810133614.9925-1-bevers@mesosphere.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0ae98637
...@@ -139,6 +139,9 @@ struct nsinfo *nsinfo__copy(struct nsinfo *nsi) ...@@ -139,6 +139,9 @@ struct nsinfo *nsinfo__copy(struct nsinfo *nsi)
{ {
struct nsinfo *nnsi; struct nsinfo *nnsi;
if (nsi == NULL)
return NULL;
nnsi = calloc(1, sizeof(*nnsi)); nnsi = calloc(1, sizeof(*nnsi));
if (nnsi != NULL) { if (nnsi != NULL) {
nnsi->pid = nsi->pid; nnsi->pid = nsi->pid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment