From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756204AbcEYRil (ORCPT ); Wed, 25 May 2016 13:38:41 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:51300 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932734AbcEYRbW (ORCPT ); Wed, 25 May 2016 13:31:22 -0400 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Steven Rostedt , Andrew Morton , Jiri Olsa , Namhyung Kim , Arnaldo Carvalho de Melo , Kamal Mostafa Subject: [PATCH 3.19.y-ckt 15/40] tools lib traceevent: Free filter tokens in process_filter() Date: Wed, 25 May 2016 10:30:18 -0700 Message-Id: <1464197443-20056-16-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464197443-20056-1-git-send-email-kamal@canonical.com> References: <1464197443-20056-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.19 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.19.8-ckt22 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: "Steven Rostedt (Red Hat)" commit e1644aae4589274223c1ab9072ddbda98dd97f6a upstream. valgrind showed that the filter token wasn't being freed properly in process_filter(). Signed-off-by: Steven Rostedt Cc: Andrew Morton Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/20150324135923.817723903@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Kamal Mostafa --- tools/lib/traceevent/parse-filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index b502344..0144b3d 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -1058,6 +1058,7 @@ process_filter(struct event_format *event, struct filter_arg **parg, *parg = current_op; else *parg = current_exp; + free(token); return PEVENT_ERRNO__UNBALANCED_PAREN; } break; @@ -1168,6 +1169,7 @@ process_filter(struct event_format *event, struct filter_arg **parg, *parg = current_op; + free(token); return 0; fail_alloc: -- 2.7.4