From: tip-bot for Taeung Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, hpa@zytor.com, jolsa@kernel.org,
acme@redhat.com, namhyung@kernel.org,
linux-kernel@vger.kernel.org, treeze.taeung@gmail.com,
tglx@linutronix.de
Subject: [tip:perf/urgent] perf inject: Fill in the missing session freeing after an error occurs
Date: Fri, 3 Jul 2015 00:48:06 -0700 [thread overview]
Message-ID: <tip-9fedfb0c5b05ae6c315de722a0548bb1f1328bf5@git.kernel.org> (raw)
In-Reply-To: <1435652124-22414-2-git-send-email-treeze.taeung@gmail.com>
Commit-ID: 9fedfb0c5b05ae6c315de722a0548bb1f1328bf5
Gitweb: http://git.kernel.org/tip/9fedfb0c5b05ae6c315de722a0548bb1f1328bf5
Author: Taeung Song <treeze.taeung@gmail.com>
AuthorDate: Tue, 30 Jun 2015 17:15:20 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 1 Jul 2015 17:53:49 -0300
perf inject: Fill in the missing session freeing after an error occurs
When an error occur an error value is just returned without freeing the
session. So allocating and freeing session have to be matched as a pair
even if an error occurs.
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1435652124-22414-2-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-inject.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 52ec66b..01b0649 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -630,12 +630,13 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
if (inject.session == NULL)
return -1;
- if (symbol__init(&inject.session->header.env) < 0)
- return -1;
+ ret = symbol__init(&inject.session->header.env);
+ if (ret < 0)
+ goto out_delete;
ret = __cmd_inject(&inject);
+out_delete:
perf_session__delete(inject.session);
-
return ret;
}
next prev parent reply other threads:[~2015-07-03 7:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 8:15 [PATCH 0/5] perf session: Fill in the missing freeing a session after an error occur Taeung Song
2015-06-30 8:15 ` [PATCH 1/5] perf inject: " Taeung Song
2015-06-30 11:21 ` Jiri Olsa
2015-07-03 7:48 ` tip-bot for Taeung Song [this message]
2015-06-30 8:15 ` [PATCH 2/5] perf kmem: " Taeung Song
2015-06-30 11:22 ` Jiri Olsa
2015-07-03 7:48 ` [tip:perf/urgent] perf kmem: Fill in the missing session freeing after an error occurs tip-bot for Taeung Song
2015-06-30 8:15 ` [PATCH 3/5] perf kvm: Fill in the missing freeing a session after an error occur Taeung Song
2015-06-30 11:14 ` Jiri Olsa
2015-06-30 8:15 ` [PATCH 4/5] perf mem: " Taeung Song
2015-06-30 11:17 ` Jiri Olsa
2015-06-30 8:15 ` [PATCH 5/5] perf report: " Taeung Song
2015-06-30 11:20 ` Jiri Olsa
2015-07-03 7:48 ` [tip:perf/urgent] perf report: Fill in the missing session freeing after an error occurs tip-bot for Taeung Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-9fedfb0c5b05ae6c315de722a0548bb1f1328bf5@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
--cc=treeze.taeung@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox