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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 689A0C43464 for ; Fri, 18 Sep 2020 02:14:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24386208DB for ; Fri, 18 Sep 2020 02:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395273; bh=/XHGCzAB/FTa+gGNhK2elMfk4FIE+JYjTVaK8RQbqr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KVy2zSMWdw5I1c3k5aNVKuEMeqQaAhL8SuQzE2zGDtJZgGtc/aGcZJoiuBZXY7/vP 4Cg22goZS0wK3OaZW3xIrSX8YJYgNU3ctuOoBZdYaz+py99JVbKccl6BFz1PvCPnQM q7iNfgBSJDQm8zguHkE9y8OYSfhnGjCVAB6jxdD8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729088AbgIRCOb (ORCPT ); Thu, 17 Sep 2020 22:14:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:42140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728190AbgIRCOP (ORCPT ); Thu, 17 Sep 2020 22:14:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AACF8239E5; Fri, 18 Sep 2020 02:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600395254; bh=/XHGCzAB/FTa+gGNhK2elMfk4FIE+JYjTVaK8RQbqr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DGsUuKeWLuBTrV5Ij1bU71e76rfVBJ15RwNAMVFBzGaT/0+eh1O/nn57zQBjj56+V ztLEOo3AI7iRmFg1F772yuL3FWicao0CVX5rT/vI4H+zWR3cozFnTGFR9zNSF3zKs7 SYOlkR3Csv2K+dAjQ6YYj3G20AZ4oggcRuYW3WUY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ian Rogers , Jiri Olsa , Adrian Hunter , Alexander Shishkin , Andi Kleen , Leo Yan , Mark Rutland , Namhyung Kim , Peter Zijlstra , Stephane Eranian , clang-built-linux@googlegroups.com, Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 4.14 095/127] perf parse-events: Fix memory leaks found on parse_events Date: Thu, 17 Sep 2020 22:11:48 -0400 Message-Id: <20200918021220.2066485-95-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918021220.2066485-1-sashal@kernel.org> References: <20200918021220.2066485-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ian Rogers [ Upstream commit e8dfb81838b14f82521968343884665b996646ef ] Fix a memory leak found by applying LLVM's libfuzzer on parse_events(). Signed-off-by: Ian Rogers Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Leo Yan Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Cc: clang-built-linux@googlegroups.com Link: http://lore.kernel.org/lkml/20200319023101.82458-1-irogers@google.com [ split from a larger patch, use zfree() ] Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/parse-events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 096c52f296d77..2733cdfdf04c6 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1258,6 +1258,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state, list_for_each_entry_safe(pos, tmp, &config_terms, list) { list_del_init(&pos->list); + zfree(&pos->val.str); free(pos); } return -EINVAL; -- 2.25.1