From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760703AbcCEIRi (ORCPT ); Sat, 5 Mar 2016 03:17:38 -0500 Received: from torg.zytor.com ([198.137.202.12]:58730 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759531AbcCEIRV (ORCPT ); Sat, 5 Mar 2016 03:17:21 -0500 Date: Sat, 5 Mar 2016 00:17:05 -0800 From: tip-bot for Wang Nan Message-ID: Cc: namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, ast@kernel.org, jolsa@kernel.org, lizefan@huawei.com, acme@redhat.com, wangnan0@huawei.com, mingo@kernel.org, hekuang@huawei.com, masami.hiramatsu.pt@hitachi.com, hpa@zytor.com Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, hekuang@huawei.com, mingo@kernel.org, wangnan0@huawei.com, acme@redhat.com, lizefan@huawei.com, ast@kernel.org, jolsa@kernel.org In-Reply-To: <1456479154-136027-30-git-send-email-wangnan0@huawei.com> References: <1456479154-136027-30-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Ensure return non-zero rc when mmap fail Git-Commit-ID: 95c365617aa37878592f2f1c6c64e1abb19f0d4a 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: 95c365617aa37878592f2f1c6c64e1abb19f0d4a Gitweb: http://git.kernel.org/tip/95c365617aa37878592f2f1c6c64e1abb19f0d4a Author: Wang Nan AuthorDate: Fri, 26 Feb 2016 09:32:17 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 3 Mar 2016 11:10:36 -0300 perf record: Ensure return non-zero rc when mmap fail perf_evlist__mmap_ex() can fail without setting errno (for example, fail in condition checking. In this case all syscall is success). If this happen, record__open() incorrectly returns 0. Force setting rc is a quick way to avoid this problem, or we have to follow all possible code path in perf_evlist__mmap_ex() to make sure there's at least one system call before returning an error. Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: He Kuang Cc: Jiri Olsa Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1456479154-136027-30-git-send-email-wangnan0@huawei.com Signed-off-by: He Kuang Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 46e2772..515510e 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -324,7 +324,10 @@ try_again: } else { pr_err("failed to mmap with %d (%s)\n", errno, strerror_r(errno, msg, sizeof(msg))); - rc = -errno; + if (errno) + rc = -errno; + else + rc = -EINVAL; } goto out; }