Commit 5e51aa84 authored Aug 10, 2018 by Benno Evers Committed by Greg Kroah-Hartman Sep 15, 2018

perf tools: Check for null when copying nsinfo.



[ Upstream commit 3f4417d693b43fa240ac8bde4487f67745ca23d8 ]

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: Benno Evers <bevers@mesosphere.com>
Acked-by: Namhyung 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.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 800dbcee

tools/perf/util/namespaces.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -138,6 +138,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;