Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 002c4fd9 authored by Robert Richter's avatar Robert Richter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix out-of-bound access to struct perf_session 

If filename is NULL there is an out-of-bound access to struct
perf_session if it would be used with perf_session__open(). Shouldn't
actually happen in current implementation as filename is always !NULL.
Fixing this by always null-terminating filename.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1323248577-11268-3-git-send-email-robert.richter@amd.com


Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f7a8a133

tools/perf/util/session.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, 
				       bool force, bool repipe,

				       bool force, bool repipe,

				       struct perf_tool *tool)

				       struct perf_tool *tool)

{

{

	size_t len = filename ? strlen(filename) + 1 : 0;

	size_t len = filename ? strlen(filename) : 0;

	struct perf_session *self = zalloc(sizeof(*self) + len);

	struct perf_session *self = zalloc(sizeof(*self) + len);





	if (self == NULL)

	if (self == NULL)

tools/perf/util/session.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ struct perf_session { 
	int			cwdlen;

	int			cwdlen;

	char			*cwd;

	char			*cwd;

	struct ordered_samples	ordered_samples;

	struct ordered_samples	ordered_samples;

	char			filename[0];

	char			filename[1];

};

};





struct perf_tool;

struct perf_tool;