From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 655E0C432C3 for ; Fri, 15 Nov 2019 07:41:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 469E820857 for ; Fri, 15 Nov 2019 07:41:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727438AbfKOHlD (ORCPT ); Fri, 15 Nov 2019 02:41:03 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:42602 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726017AbfKOHkY (ORCPT ); Fri, 15 Nov 2019 02:40:24 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1iVWDF-0002VX-2p; Fri, 15 Nov 2019 08:40:13 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 9B48E1C08AC; Fri, 15 Nov 2019 08:40:12 +0100 (CET) Date: Fri, 15 Nov 2019 07:40:12 -0000 From: "tip-bot2 for Ian Rogers" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf parse: Use YYABORT to clear stack after failure, plugging leaks Cc: Ian Rogers , Alexander Shishkin , Andi Kleen , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org In-Reply-To: <20191109075840.181231-1-irogers@google.com> References: <20191109075840.181231-1-irogers@google.com> MIME-Version: 1.0 Message-ID: <157380361217.29467.17950612808505016356.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: e1e9b78d3957a267346a86c8f2c433f6a332af65 Gitweb: https://git.kernel.org/tip/e1e9b78d3957a267346a86c8f2c433f6a332af65 Author: Ian Rogers AuthorDate: Fri, 08 Nov 2019 23:58:40 -08:00 Committer: Arnaldo Carvalho de Melo CommitterDate: Tue, 12 Nov 2019 08:34:16 -03:00 perf parse: Use YYABORT to clear stack after failure, plugging leaks Using return rather than YYABORT means that the stack isn't cleared up following a failure. The change to YYABORT means the return value is 1 rather than -1, but the callers just check for a result of 0 (success). Add missing free of a list when an error occurs in event_pmu. Signed-off-by: Ian Rogers Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lore.kernel.org/lkml/20191109075840.181231-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-events.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 4cac830..e2eea4e 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -284,6 +284,7 @@ PE_NAME opt_pmu_config do { \ parse_events_terms__delete($2); \ parse_events_terms__delete(orig_terms); \ + free(list); \ free($1); \ free(pattern); \ YYABORT; \ @@ -550,7 +551,7 @@ tracepoint_name opt_event_config free($1.event); if (err) { free(list); - return -1; + YYABORT; } $$ = list; }