From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422967AbcFHIh3 (ORCPT ); Wed, 8 Jun 2016 04:37:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53652 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161799AbcFHIhZ (ORCPT ); Wed, 8 Jun 2016 04:37:25 -0400 Date: Wed, 8 Jun 2016 01:37:09 -0700 From: tip-bot for Wang Nan Message-ID: Cc: mhiramat@kernel.org, hpa@zytor.com, acme@redhat.com, hekuang@huawei.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, mingo@kernel.org, lizefan@huawei.com, jolsa@kernel.org Reply-To: lizefan@huawei.com, mingo@kernel.org, tglx@linutronix.de, jolsa@kernel.org, wangnan0@huawei.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, hekuang@huawei.com, hpa@zytor.com, mhiramat@kernel.org, acme@redhat.com In-Reply-To: <1464699975-230440-1-git-send-email-wangnan0@huawei.com> References: <1464699975-230440-1-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Fix alloc_mmap() failure path Git-Commit-ID: 946ae1d41d4b0c77b9f63b4a0393d8a1283a7f9d 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: 946ae1d41d4b0c77b9f63b4a0393d8a1283a7f9d Gitweb: http://git.kernel.org/tip/946ae1d41d4b0c77b9f63b4a0393d8a1283a7f9d Author: Wang Nan AuthorDate: Tue, 31 May 2016 13:06:15 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 3 Jun 2016 14:53:46 -0300 perf evlist: Fix alloc_mmap() failure path If zalloc fail, setting evlist->mmap[i].fd is unsafe and perf_evlist__alloc_mmap() should bail out right after that. Signed-off-by: Wang Nan Acked-by: Masami Hiramatsu Cc: He Kuang Cc: Jiri Olsa Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Fixes: d4c6fb36ac2c ("perf evsel: Record fd into perf_mmap") Link: http://lkml.kernel.org/r/1464699975-230440-1-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index e0f3094..1b918aa 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -946,9 +946,12 @@ static int perf_evlist__alloc_mmap(struct perf_evlist *evlist) if (cpu_map__empty(evlist->cpus)) evlist->nr_mmaps = thread_map__nr(evlist->threads); evlist->mmap = zalloc(evlist->nr_mmaps * sizeof(struct perf_mmap)); + if (!evlist->mmap) + return -ENOMEM; + for (i = 0; i < evlist->nr_mmaps; i++) evlist->mmap[i].fd = -1; - return evlist->mmap != NULL ? 0 : -ENOMEM; + return 0; } struct mmap_params {