Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1086967ybn; Tue, 24 Sep 2019 14:32:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxNlza6ZzXXSO2uIgKecsBnmDHS51FpIlHjKHoAuzjjdHFkyDJR90l8zxVCXIBzCl4fK1dm X-Received: by 2002:a5d:4ac5:: with SMTP id y5mr330039wrs.179.1569360761925; Tue, 24 Sep 2019 14:32:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569360761; cv=none; d=google.com; s=arc-20160816; b=OazSPwc6MlxU5o0E8T453aYYMGfBl3VR7UxVTQBarKEdxc9OYiB4nvYIv1/6FpHQIp rOKbzy9ENcmJTMp4wrEFOnfULZ3GmLwDjzr2A68SINXzo2lChJe32mcvEZPUiHR20r9e uj1ilq+S7v+/5Y9jQHkRR5WWHv/2C4ws7ZoYZfdyKinhBBYkDjg16VpV8PGAdc3jAcO7 VjJ8KOD8Mja2DjnaRFEmzvP2rUUxbfVKFs24ZCsGk4pcf2ifT+U3CLuQbxCGInRLRiS+ rVqa1n44/BWqbQrnte30UNr37Z9dCVtOj+elMbEDm15FrA5HLmIHVLANriwJwBudPaUW 4RUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Q6su4j3OjikaTbobEoDQrfelxCg4Vk1708GA4aT3/tk=; b=1JmTJAHQ8+6tSDlWMAX7qebfi15zOzF1GeYNc4aYIZSHgfMzu6qXHDOKuip3aWGB0x c9bdVfd0bY074x5mwQdaHbI/cTq650JgmrhVK2Mq/C6bANiKXG2nMV9QkfmqeZTHZML/ 0PiOTLKyfqIPvjh+zgzYKxdt9iybAb9TtgGzpODxnE0VGu0W/9rTEy3wMjUiXuRkqgVS D5Ar/rxZDLHFJXiji56f/bkY0gJe9dFFDgE6xIyET1LmiEvwzkWB3qbYUWBn453eDtRy X7OmOWOoMqPwqj+a4YR0Ae7k/h5iqzxWGf7352azvv92qWQhJ5cULnLhyDe2B2usCngX gu5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BMIXjIdg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z26si1523002ejw.359.2019.09.24.14.32.18; Tue, 24 Sep 2019 14:32:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BMIXjIdg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438314AbfIVTdn (ORCPT + 99 others); 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