From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760733AbcCEITo (ORCPT ); Sat, 5 Mar 2016 03:19:44 -0500 Received: from torg.zytor.com ([198.137.202.12]:58868 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758765AbcCEITg (ORCPT ); Sat, 5 Mar 2016 03:19:36 -0500 Date: Sat, 5 Mar 2016 00:18:42 -0800 From: tip-bot for Colin Ian King Message-ID: Cc: peterz@infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, rostedt@goodmis.org, acme@redhat.com, namhyung@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org, javi.merino@arm.com, hekuang@huawei.com, colin.king@canonical.com Reply-To: acme@redhat.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, tglx@linutronix.de, peterz@infradead.org, adrian.hunter@intel.com, namhyung@kernel.org, mingo@kernel.org, javi.merino@arm.com, jolsa@kernel.org, hpa@zytor.com, colin.king@canonical.com, hekuang@huawei.com In-Reply-To: <1456875980-25606-1-git-send-email-colin.king@canonical.com> References: <1456875980-25606-1-git-send-email-colin.king@canonical.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf script: Fix double free on command_line Git-Commit-ID: 979ac257b00c53aacec3eacf86142e8c00bee889 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: 979ac257b00c53aacec3eacf86142e8c00bee889 Gitweb: http://git.kernel.org/tip/979ac257b00c53aacec3eacf86142e8c00bee889 Author: Colin Ian King AuthorDate: Tue, 1 Mar 2016 23:46:20 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 3 Mar 2016 11:10:37 -0300 perf script: Fix double free on command_line The 'command_line' variable is free'd twice if db_export__branch_types() fails. To avoid this, defer the free'ing of 'command_line' to after this call so that the error return path will just free 'command_line' once. Signed-off-by: Colin Ian King Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: He Kuang Cc: Javi Merino Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/1456875980-25606-1-git-send-email-colin.king@canonical.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/scripting-engines/trace-event-python.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 309d90f..fbd0524 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -1094,8 +1094,6 @@ static int python_start_script(const char *script, int argc, const char **argv) goto error; } - free(command_line); - set_table_handlers(tables); if (tables->db_export_mode) { @@ -1104,6 +1102,8 @@ static int python_start_script(const char *script, int argc, const char **argv) goto error; } + free(command_line); + return err; error: Py_Finalize();