From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934882AbcI2SRT (ORCPT ); Thu, 29 Sep 2016 14:17:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52030 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934667AbcI2SRL (ORCPT ); Thu, 29 Sep 2016 14:17:11 -0400 Date: Thu, 29 Sep 2016 11:17:03 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: tglx@linutronix.de, mathieu.poirier@linaro.org, adrian.hunter@intel.com, acme@redhat.com, mingo@kernel.org, hpa@zytor.com, mhiramat@kernel.org, jolsa@redhat.com, linux-kernel@vger.kernel.org Reply-To: jolsa@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, acme@redhat.com, mhiramat@kernel.org, hpa@zytor.com, adrian.hunter@intel.com, mathieu.poirier@linaro.org, tglx@linutronix.de In-Reply-To: <1474641528-18776-12-git-send-email-adrian.hunter@intel.com> References: <1474641528-18776-12-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf intel-pt: Fix missing error codes processing auxtrace_info Git-Commit-ID: 4d34e10a9f9a38c611cac0deda8f91b064282747 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: 4d34e10a9f9a38c611cac0deda8f91b064282747 Gitweb: http://git.kernel.org/tip/4d34e10a9f9a38c611cac0deda8f91b064282747 Author: Adrian Hunter AuthorDate: Fri, 23 Sep 2016 17:38:43 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 29 Sep 2016 11:17:04 -0300 perf intel-pt: Fix missing error codes processing auxtrace_info Fix 2 places where the err variable was not being set. Signed-off-by: Adrian Hunter Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Mathieu Poirier Link: http://lkml.kernel.org/r/1474641528-18776-12-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/intel-pt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c index 77fbf02..96519e8 100644 --- a/tools/perf/util/intel-pt.c +++ b/tools/perf/util/intel-pt.c @@ -2138,11 +2138,13 @@ int intel_pt_process_auxtrace_info(union perf_event *event, pt->switch_evsel = intel_pt_find_sched_switch(session->evlist); if (!pt->switch_evsel) { pr_err("%s: missing sched_switch event\n", __func__); + err = -EINVAL; goto err_delete_thread; } } else if (pt->have_sched_switch == 2 && !intel_pt_find_switch(session->evlist)) { pr_err("%s: missing context_switch attribute flag\n", __func__); + err = -EINVAL; goto err_delete_thread; }