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=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 DE9CBC3A5A6 for ; Sun, 22 Sep 2019 19:33:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6D64206B6 for ; Sun, 22 Sep 2019 19:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569180824; bh=0DwUbrY2gMUOyVzwXRowA3D8idnT6qABSLQ/kcuTbkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iZTTo8L6SJsQPv3wBFSGG1K3RTD36B/gG4Pjqv6huZ+NxmsEHWFUnyxQQ5uv96oDQ kEU9eiHvi04bXkCh4N6h28YhcbxAP7Lb5cva7QWPkIaeQ8tPlYb8eIiD9nQTnF5/Q/ eTKRUJG9pLMgjx7+9xi1eFwLyE0y/uECkscAfTUA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438331AbfIVTdn (ORCPT ); Sun, 22 Sep 2019 15:33:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:43982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390965AbfIVSrc (ORCPT ); Sun, 22 Sep 2019 14:47:32 -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 34434214AF; Sun, 22 Sep 2019 18:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178052; bh=0DwUbrY2gMUOyVzwXRowA3D8idnT6qABSLQ/kcuTbkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BMIXjIdgm8dpurdyoGZFCVK+1tqqdzaoXQBxG9GpgNkQZmV66yPe5Zu3UHY4YbOtd wQkNyTomqyoC+mTGpF7Xp+ono/VTJxiTgNbQn0ZL5abICKEgEgR0r98Oecu9P0SSzb EDciRs/wpEqHlrE614nrJ+lnMi950d2QOE0U6j6c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Gustavo A. R. Silva" , Alexander Shishkin , Andi Kleen , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.3 129/203] perf script: Fix memory leaks in list_scripts() Date: Sun, 22 Sep 2019 14:42:35 -0400 Message-Id: <20190922184350.30563-129-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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" [ Upstream commit 3b4acbb92dbda4829e021e5c6d5410658849fa1c ] 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 Signed-off-by: Sasha Levin --- 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 4d565cc14076c..0355d4aaf2eed 100644 --- a/tools/perf/ui/browsers/scripts.c +++ b/tools/perf/ui/browsers/scripts.c @@ -131,8 +131,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.20.1