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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 D386CC10DCE for ; Fri, 6 Mar 2020 19:12:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA1C920675 for ; Fri, 6 Mar 2020 19:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583521949; bh=f6T2t6/wg36l9MAG5S+wlqlVCn9ZuAyZtPigCNVesiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SJuSz1q4qWddMR5NpP6fhcWyxVvO+0QePDudtekWXlFYORo3+Y+DR0zXu0boIgBbR TgpgPPaJq4b5aBqiRS2HP2KKF0F7HHf03aA3dn5ICVX6bJcn0XJ3G69ShFYrLWqEcl uYcMel58vF5Si/wX5xfAKbBBVgCuKrQXeEkn3wyI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727226AbgCFTM2 (ORCPT ); Fri, 6 Mar 2020 14:12:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:39532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727196AbgCFTMY (ORCPT ); Fri, 6 Mar 2020 14:12:24 -0500 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F41652073B; Fri, 6 Mar 2020 19:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583521944; bh=f6T2t6/wg36l9MAG5S+wlqlVCn9ZuAyZtPigCNVesiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F4TT7o+u9WVxsgGdfE/a/vNTKPY0SOevXT6Ko5+/3tPJBt99LhPTvr3D1uBeQwj54 xg/73cYmicBPt6qR2mBdFsusYokpsPwiOaQK7xj9MSqbj7cXZ8JonyOedx9nBH8jfS RD5VmtPBxYj6XXkzCZ1gRT2EamFcHJW+RraB4IWE= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, John Garry , Jiri Olsa , Alexander Shishkin , Andi Kleen , James Clark , Joakim Zhang , Mark Rutland , Peter Zijlstra , Will Deacon , linuxarm@huawei.com, Arnaldo Carvalho de Melo Subject: [PATCH 5/6] perf jevents: Fix leak of mapfile memory Date: Fri, 6 Mar 2020 16:11:42 -0300 Message-Id: <20200306191144.12762-10-acme@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200306191144.12762-1-acme@kernel.org> References: <20200306191144.12762-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Garry The memory for global pointer is never freed during normal program execution, so let's do that in the main function exit as a good programming practice. A stray blank line is also removed. Reported-by: Jiri Olsa Signed-off-by: John Garry Cc: Alexander Shishkin Cc: Andi Kleen Cc: James Clark Cc: Joakim Zhang Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Will Deacon Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1583406486-154841-2-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/pmu-events/jevents.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 079c77b6a2fd..27b4da80f751 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -1082,10 +1082,9 @@ static int process_one_file(const char *fpath, const struct stat *sb, */ int main(int argc, char *argv[]) { - int rc; + int rc, ret = 0; int maxfds; char ldirname[PATH_MAX]; - const char *arch; const char *output_file; const char *start_dirname; @@ -1156,7 +1155,8 @@ int main(int argc, char *argv[]) /* Make build fail */ fclose(eventsfp); free_arch_std_events(); - return 1; + ret = 1; + goto out_free_mapfile; } else if (rc) { goto empty_map; } @@ -1174,14 +1174,17 @@ int main(int argc, char *argv[]) /* Make build fail */ fclose(eventsfp); free_arch_std_events(); - return 1; + ret = 1; } - return 0; + + goto out_free_mapfile; empty_map: fclose(eventsfp); create_empty_mapping(output_file); free_arch_std_events(); - return 0; +out_free_mapfile: + free(mapfile); + return ret; } -- 2.21.1