From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933451AbcAMJk1 (ORCPT ); Wed, 13 Jan 2016 04:40:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48659 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932526AbcAMJkY (ORCPT ); Wed, 13 Jan 2016 04:40:24 -0500 Date: Wed, 13 Jan 2016 01:40:05 -0800 From: tip-bot for Wang Nan Message-ID: Cc: hekuang@huawei.com, hpa@zytor.com, namhyung@kernel.org, jolsa@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com, lizefan@huawei.com, wangnan0@huawei.com, mingo@kernel.org, masami.hiramatsu.pt@hitachi.com Reply-To: acme@redhat.com, wangnan0@huawei.com, lizefan@huawei.com, mingo@kernel.org, masami.hiramatsu.pt@hitachi.com, hekuang@huawei.com, tglx@linutronix.de, hpa@zytor.com, jolsa@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1452593524-138970-1-git-send-email-wangnan0@huawei.com> References: <1452593524-138970-1-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Fix mmap2 event allocation in synthesize code Git-Commit-ID: b0fb978e97f58ca930f7cafc4ddc264218710765 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b0fb978e97f58ca930f7cafc4ddc264218710765 Gitweb: http://git.kernel.org/tip/b0fb978e97f58ca930f7cafc4ddc264218710765 Author: Wang Nan AuthorDate: Tue, 12 Jan 2016 10:12:04 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Jan 2016 11:24:43 -0300 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 Reviewed-by: Masami Hiramatsu Acked-by: Jiri Olsa Cc: He Kuang Cc: Namhyung Kim Cc: Zefan Li 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 --- tools/perf/util/event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index cd61bb1..85155e9 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -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;