From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753096AbdDJUPF (ORCPT ); Mon, 10 Apr 2017 16:15:05 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34056 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752545AbdDJUPC (ORCPT ); Mon, 10 Apr 2017 16:15:02 -0400 From: David Carrillo-Cisneros To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Andi Kleen , Simon Que , Wang Nan , Jiri Olsa , He Kuang , Masami Hiramatsu , Stephane Eranian , Paul Turner , David Carrillo-Cisneros Subject: [PATCH 1/7] perf inject: don't proceed if perf_session__process_event fails Date: Mon, 10 Apr 2017 13:14:26 -0700 Message-Id: <20170410201432.24807-2-davidcc@google.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d-goog In-Reply-To: <20170410201432.24807-1-davidcc@google.com> References: <20170410201432.24807-1-davidcc@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 42dff0b1375a..65e1c026a2f0 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) -- 2.12.2.715.g7642488e1d-goog