Commit b0fb978e authored Jan 12, 2016 by Wang Nan Committed by Arnaldo Carvalho de Melo Jan 12, 2016

perf tools: Fix mmap2 event allocation in synthesize code



perf_event__synthesize_mmap_events() issues mmap2 events, but the memory
of that event is allocated using:

 mmap_event = malloc(sizeof(mmap_event->mmap) + machine->id_hdr_size);

If path of mmap source file is long (near PATH_MAX), random crash would
happen. Should use sizeof(mmap_event->mmap2).

Fix two memory allocations.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: He Kuang <hekuang@huawei.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1452593524-138970-1-git-send-email-wangnan0@huawei.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 8a59f3cc

tools/perf/util/event.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -503,7 +503,7 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,
		if (comm_event == NULL)
		goto out;

		mmap_event = malloc(sizeof(mmap_event->mmap) + machine->id_hdr_size);
		mmap_event = malloc(sizeof(mmap_event->mmap2) + machine->id_hdr_size);
		if (mmap_event == NULL)
		goto out_free_comm;

		@@ -577,7 +577,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool,
		if (comm_event == NULL)
		goto out;

		mmap_event = malloc(sizeof(mmap_event->mmap) + machine->id_hdr_size);
		mmap_event = malloc(sizeof(mmap_event->mmap2) + machine->id_hdr_size);
		if (mmap_event == NULL)
		goto out_free_comm;

Admin message