From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934866AbcI2SOx (ORCPT ); Thu, 29 Sep 2016 14:14:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51830 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934834AbcI2SOg (ORCPT ); Thu, 29 Sep 2016 14:14:36 -0400 Date: Thu, 29 Sep 2016 11:14:29 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: tglx@linutronix.de, jolsa@redhat.com, hpa@zytor.com, mhiramat@kernel.org, mathieu.poirier@linaro.org, acme@redhat.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, mingo@kernel.org Reply-To: jolsa@redhat.com, tglx@linutronix.de, mhiramat@kernel.org, acme@redhat.com, mathieu.poirier@linaro.org, hpa@zytor.com, adrian.hunter@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1474641528-18776-6-git-send-email-adrian.hunter@intel.com> References: <1474641528-18776-6-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Fix error paths Git-Commit-ID: 5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1 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: 5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1 Gitweb: http://git.kernel.org/tip/5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1 Author: Adrian Hunter AuthorDate: Fri, 23 Sep 2016 17:38:37 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 29 Sep 2016 11:17:01 -0300 perf record: Fix error paths Some error paths do not tidy-up. Fix that. Signed-off-by: Adrian Hunter Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Mathieu Poirier Link: http://lkml.kernel.org/r/1474641528-18776-6-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index b32a880..962adcf 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1573,23 +1573,23 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) if (!rec->itr) { rec->itr = auxtrace_record__init(rec->evlist, &err); if (err) - return err; + goto out; } err = auxtrace_parse_snapshot_options(rec->itr, &rec->opts, rec->opts.auxtrace_snapshot_opts); if (err) - return err; + goto out; if (dry_run) - return 0; + goto out; err = bpf__setup_stdout(rec->evlist); if (err) { bpf__strerror_setup_stdout(rec->evlist, err, errbuf, sizeof(errbuf)); pr_err("ERROR: Setup BPF stdout failed: %s\n", errbuf); - return err; + goto out; } err = -ENOMEM;