From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752682AbcEMJST (ORCPT ); Fri, 13 May 2016 05:18:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37354 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012AbcEMJSP (ORCPT ); Fri, 13 May 2016 05:18:15 -0400 Date: Fri, 13 May 2016 02:18:02 -0700 From: tip-bot for Steven Rostedt Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, rostedt@goodmis.org, acme@redhat.com, hpa@zytor.com In-Reply-To: <20160511150936.678c18a1@gandalf.local.home> References: <20160511150936.678c18a1@gandalf.local.home> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools lib traceevent: Do not reassign parg after collapse_tree() Git-Commit-ID: 106b816cb46ebd87408b4ed99a2e16203114daa6 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: 106b816cb46ebd87408b4ed99a2e16203114daa6 Gitweb: http://git.kernel.org/tip/106b816cb46ebd87408b4ed99a2e16203114daa6 Author: Steven Rostedt AuthorDate: Wed, 11 May 2016 15:09:36 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 May 2016 11:27:00 -0300 tools lib traceevent: Do not reassign parg after collapse_tree() At the end of process_filter(), collapse_tree() was changed to update the parg parameter, but the reassignment after the call wasn't removed. What happens is that the "current_op" gets modified and freed and parg is assigned to the new allocated argument. But after the call to collapse_tree(), parg is assigned again to the just freed "current_op", and this causes the tool to crash. The current_op variable must also be assigned to NULL in case of error, otherwise it will cause it to be free()ed twice. Signed-off-by: Steven Rostedt Acked-by: Namhyung Kim Cc: stable@vger.kernel.org # 3.14+ Fixes: 42d6194d133c ("tools lib traceevent: Refactor process_filter()") Link: http://lkml.kernel.org/r/20160511150936.678c18a1@gandalf.local.home Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/parse-filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index 0144b3d..88cccea 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -1164,11 +1164,11 @@ process_filter(struct event_format *event, struct filter_arg **parg, current_op = current_exp; ret = collapse_tree(current_op, parg, error_str); + /* collapse_tree() may free current_op, and updates parg accordingly */ + current_op = NULL; if (ret < 0) goto fail; - *parg = current_op; - free(token); return 0;