From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932316AbbGCHsw (ORCPT ); Fri, 3 Jul 2015 03:48:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36140 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932258AbbGCHsi (ORCPT ); Fri, 3 Jul 2015 03:48:38 -0400 Date: Fri, 3 Jul 2015 00:48:25 -0700 From: tip-bot for Taeung Song Message-ID: Cc: acme@redhat.com, treeze.taeung@gmail.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, jolsa@kernel.org, mingo@kernel.org Reply-To: mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, tglx@linutronix.de, treeze.taeung@gmail.com, acme@redhat.com In-Reply-To: <1435652124-22414-3-git-send-email-treeze.taeung@gmail.com> References: <1435652124-22414-3-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf kmem: Fill in the missing session freeing after an error occurs Git-Commit-ID: 249ca1a86067e6a4198f7b2b7e19b505e2f41864 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: 249ca1a86067e6a4198f7b2b7e19b505e2f41864 Gitweb: http://git.kernel.org/tip/249ca1a86067e6a4198f7b2b7e19b505e2f41864 Author: Taeung Song AuthorDate: Tue, 30 Jun 2015 17:15:21 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 1 Jul 2015 17:53:49 -0300 perf kmem: Fill in the missing session freeing after an error occurs When an error occurs 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 Acked-by: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/1435652124-22414-3-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-kmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 950f296..23b1faa 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -1916,7 +1916,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) if (!perf_evlist__find_tracepoint_by_name(session->evlist, "kmem:kmalloc")) { pr_err(errmsg, "slab", "slab"); - return -1; + goto out_delete; } } @@ -1927,7 +1927,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) "kmem:mm_page_alloc"); if (evsel == NULL) { pr_err(errmsg, "page", "page"); - return -1; + goto out_delete; } kmem_page_size = pevent_get_page_size(evsel->tp_format->pevent);