From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965071AbcALKt0 (ORCPT ); Tue, 12 Jan 2016 05:49:26 -0500 Received: from mail9.hitachi.co.jp ([133.145.228.44]:55910 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934514AbcALKtX (ORCPT ); Tue, 12 Jan 2016 05:49:23 -0500 From: =?utf-8?B?5bmz5p2+6ZuF5bezIC8gSElSQU1BVFXvvIxNQVNBTUk=?= To: "'Wang Nan'" , "acme@kernel.org" CC: "jolsa@kernel.org" , "linux-kernel@vger.kernel.org" , Arnaldo Carvalho de Melo , He Kuang , Namhyung Kim , Zefan Li , "pi3orama@163.com" Subject: RE: [PATCH 16/53 v2] perf tools: Fix mmap2 event allocation in synthesize code Thread-Topic: [PATCH 16/53 v2] perf tools: Fix mmap2 event allocation in synthesize code Thread-Index: AQHRTSHAiKhXNvd89kmk9Ol9F7q2Ip73q/4g Date: Tue, 12 Jan 2016 10:49:19 +0000 Message-ID: <50399556C9727B4D88A595C8584AAB3752692616@GSjpTKYDCembx32.service.hitachi.net> References: <20160111210327.GG18367@kernel.org> <1452593524-138970-1-git-send-email-wangnan0@huawei.com> In-Reply-To: <1452593524-138970-1-git-send-email-wangnan0@huawei.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.198.219.54] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id u0CAnt4w007252 >From: Wang Nan [mailto:wangnan0@huawei.com] > >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. Looks good to me. But hope to have another rename patch soon after this... Reviewed-by: Masami Hiramatsu Thanks, > >Signed-off-by: Wang Nan >Acked-by: Jiri Olsa >Cc: Arnaldo Carvalho de Melo >Cc: He Kuang >Cc: Masami Hiramatsu >Cc: Namhyung Kim >Cc: Zefan Li >Cc: pi3orama@163.com >--- > >v1 -> v2: Don't rename mmap to mmap2. > >--- > 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; > >-- >1.8.3.4