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,URIBL_BLOCKED,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 D0661C3A59F for ; Tue, 27 Aug 2019 01:37:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A84162189D for ; Tue, 27 Aug 2019 01:37:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566869862; bh=F2BZeg9vkl3GvkxEZJZgNFKnXRjDhwKDe1MfIKRr79I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GoDP29W9SNCRRy9JW5x1TCeafIqTyrft8p6NxD36jPRjIwBlAlbqMi+E1VPM1MIki WP5wBKAnFrjxwpu0n7thhBedhGWQuH4myfEMyuLKJRtMDIhgpFcrjTIfMMay5Mn9Kk b6yPpSXlHzrgzkpN+IcB1c22l9v3t+8/P7kDwEZY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729053AbfH0Bhl (ORCPT ); Mon, 26 Aug 2019 21:37:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:50702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728958AbfH0Bhb (ORCPT ); Mon, 26 Aug 2019 21:37:31 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.35.50]) (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 5B4D421872; Tue, 27 Aug 2019 01:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566869850; bh=F2BZeg9vkl3GvkxEZJZgNFKnXRjDhwKDe1MfIKRr79I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SHjEPMT+VvzPITBHp8ZfJA7eRCnuIQhIHclLjwhHC8bhSzeZtMCd5GD6ovBvnkfhl 5q3iOV7NChoGpJdqxF61AUdE61qUSRxzt4LWlhnsc469nA0UYAn3Zh6iEg+AGzFh44 YrN+NHfyw4/l0xD1W/ueDr5dbwCezMYUBoil/jGs= 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, "Gustavo A. R. Silva" , Alexander Shishkin , Andi Kleen , Jiri Olsa , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 16/33] perf script: Fix memory leaks in list_scripts() Date: Mon, 26 Aug 2019 22:36:17 -0300 Message-Id: <20190827013634.3173-17-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190827013634.3173-1-acme@kernel.org> References: <20190827013634.3173-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: "Gustavo A. R. Silva" In case memory resources for *buf* and *paths* were allocated, jump to *out* and release them before return. Signed-off-by: Gustavo A. R. Silva Cc: Alexander Shishkin Cc: Andi Kleen Cc: Gustavo A. R. Silva Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Addresses-Coverity-ID: 1444328 ("Resource leak") Fixes: 6f3da20e151f ("perf report: Support builtin perf script in scripts menu") Link: http://lkml.kernel.org/r/20190408162748.GA21008@embeddedor Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/scripts.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/ui/browsers/scripts.c b/tools/perf/ui/browsers/scripts.c index f2fd9f0d7ab5..50e0c03171f2 100644 --- a/tools/perf/ui/browsers/scripts.c +++ b/tools/perf/ui/browsers/scripts.c @@ -133,8 +133,10 @@ static int list_scripts(char *script_name, bool *custom, int key = ui_browser__input_window("perf script command", "Enter perf script command line (without perf script prefix)", script_args, "", 0); - if (key != K_ENTER) - return -1; + if (key != K_ENTER) { + ret = -1; + goto out; + } sprintf(script_name, "%s script %s", perf, script_args); } else if (choice < num + max_std) { strcpy(script_name, paths[choice]); -- 2.21.0