From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752709AbdDLFnt (ORCPT ); Wed, 12 Apr 2017 01:43:49 -0400 Received: from terminus.zytor.com ([65.50.211.136]:32849 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751108AbdDLFnr (ORCPT ); Wed, 12 Apr 2017 01:43:47 -0400 Date: Tue, 11 Apr 2017 22:39:03 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: mingo@kernel.org, avagin@openvz.org, alexander.shishkin@linux.intel.com, hekuang@huawei.com, tglx@linutronix.de, wangnan0@huawei.com, ak@linux.intel.com, sque@chromium.org, pjt@google.com, jolsa@kernel.org, davidcc@google.com, peterz@infradead.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, eranian@google.com, hpa@zytor.com Reply-To: mingo@kernel.org, avagin@openvz.org, hekuang@huawei.com, alexander.shishkin@linux.intel.com, tglx@linutronix.de, wangnan0@huawei.com, pjt@google.com, sque@chromium.org, ak@linux.intel.com, jolsa@kernel.org, davidcc@google.com, peterz@infradead.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, eranian@google.com, hpa@zytor.com In-Reply-To: <20170410201432.24807-2-davidcc@google.com> References: <20170410201432.24807-2-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf inject: Don't proceed if perf_session__process_event() fails Git-Commit-ID: bb8d521f77f3e68a713456b7fb1e99f52ff3342c 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: bb8d521f77f3e68a713456b7fb1e99f52ff3342c Gitweb: http://git.kernel.org/tip/bb8d521f77f3e68a713456b7fb1e99f52ff3342c Author: David Carrillo-Cisneros AuthorDate: Mon, 10 Apr 2017 13:14:26 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 11 Apr 2017 15:23:40 -0300 perf inject: Don't proceed if perf_session__process_event() fails All paths following perf_session__process_event() in __cmd_inject() are useless if __cmd_inject() is to fail, some depend on a correct session->evlist. First commit to add code that depends on session->evlist without checking error was commmit e558a5bd8b ("perf inject: Work with files"). It has grown since then. Change __cmd_inject() to fail immediately after perf_session__process_event() fails. Signed-off-by: David Carrillo-Cisneros Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Andrew Vagin Cc: He Kuang Cc: Masami Hiramatsu Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Fixes: e558a5bd8b74 ("perf inject: Work with files") Link: http://lkml.kernel.org/r/20170410201432.24807-2-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-inject.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 42dff0b..65e1c02 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -694,6 +694,8 @@ static int __cmd_inject(struct perf_inject *inject) lseek(fd, output_data_offset, SEEK_SET); ret = perf_session__process_events(session); + if (ret) + return ret; if (!file_out->is_pipe) { if (inject->build_ids)