Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3140709ybj; Mon, 23 Sep 2019 15:37:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxiHLDaKhCSxAonYO0K5IgQIr9E6U7U0G/o1BP2+0m/2IeKfmG+R5HfOgTdHwoyb6Kjv8ys X-Received: by 2002:a05:6402:1355:: with SMTP id y21mr1182887edw.303.1569278228002; Mon, 23 Sep 2019 15:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569278227; cv=none; d=google.com; s=arc-20160816; b=ipvDG/t+kZ5JF5+ni1nRYHA1uX/oLcifNdu5v7EULG9S3/hTwKo7rywrYIf2iULjcg 3HuWLv05yZehRY62SadQ2yOydcyusehVnglHl2L/8xPb2G8hcl0O95wCJiu+KbcqE0T/ FC3GqVoA08qwyP3LkMGhNXh+ctFafr7fFUvuORWSSlLSs9j0M/X1T3okkb8TvDiAbqnL Y11Uimu2zicS5BLRioJGHkQLviL3G5Y8TMNyPDjSesDBGfbiQYNJKxN5Dz/UgoR6zGy3 I7UJ7RTGdj7CWfiOzsURvxmie/sxmK/t2fvypye07gKXOyvHX0mErKWN01LP3M8AAM0k OEHg== 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=CPWpPLkrB5KDgzWsNXAxwD3v2KDU+U9YtkWIEwqMTtk=; b=rEDcrOmCexMtWnrb2HNYFTX+/u4Fc++6OvC0WKZS7uMzyvlj+EEndhO11KOxNGevng P+ex2cF5N+AltvMFAeeB1zlDgart8CbpSnSCkMLoPEBoc/6mbvV7zskmhFxEyAfP6F27 NdO4pIgEl4NC4Guoad5QQGdHShFjqidxPJLauAOrFvy9r6GGvdBC3Bq3gTlqYL/7+33C N0gXuHL5Pm3IaRmCfAoLh0y9bAWA5BJb4L1eHThoplyREJ6F3XnUOMVqEKSLXYbefIw5 9q62NKLJOC+RJSFQa6j9xwq0JlhMxL07fI0D190bvlMPtNs9tZjPPXUUJJkMAwmyUtCw JilQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Fp/m5hM/"; 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 rh27si5867450ejb.52.2019.09.23.15.36.44; Mon, 23 Sep 2019 15:37:07 -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="Fp/m5hM/"; 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 S2391988AbfIVStE (ORCPT + 99 others); Sun, 22 Sep 2019 14:49:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:45610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391711AbfIVSsl (ORCPT ); Sun, 22 Sep 2019 14:48:41 -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 B917F208C2; Sun, 22 Sep 2019 18:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178120; bh=A5X2Og1r81lOw6mPlGwfMS/sB3j/vqTSU+w3envdz6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fp/m5hM/Rw0duo9SmgsfuQGLex0xKJMuz1YHdqWlw9zURHLD+3eCfS7S9fWuyNvHo +dZinFnUAbXvmgozoaBleJnDyui9OsiZXCc29D4WBt1iH7538UfOm/avpERhPBsZnz 8CqgupovYcZ5TefwPQY2EC9MVTg+vJXXB7xIdaoA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Prarit Bhargava , Srinivas Pandruvada , David Arcari , Andy Shevchenko , Sasha Levin Subject: [PATCH AUTOSEL 5.3 176/203] tools/power/x86/intel-speed-select: Fix memory leak Date: Sun, 22 Sep 2019 14:43:22 -0400 Message-Id: <20190922184350.30563-176-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: Prarit Bhargava [ Upstream commit 3bc3d30ca324bfc3045a1a7fe1f5fe5ad5d92fd9 ] cpumasks are allocated by calling the alloc_cpu_mask() function and are never free'd. They should be free'd after the commands have run. Fix the memory leaks by calling free_cpu_set(). Signed-off-by: Prarit Bhargava Acked-by: Srinivas Pandruvada Cc: Srinivas Pandruvada Cc: David Arcari Cc: linux-kernel@vger.kernel.org Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- tools/power/x86/intel-speed-select/isst-config.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/power/x86/intel-speed-select/isst-config.c b/tools/power/x86/intel-speed-select/isst-config.c index 91c5ad1685a15..6a10dea01eefc 100644 --- a/tools/power/x86/intel-speed-select/isst-config.c +++ b/tools/power/x86/intel-speed-select/isst-config.c @@ -603,6 +603,10 @@ static int isst_fill_platform_info(void) close(fd); + if (isst_platform_info.api_version > supported_api_ver) { + printf("Incompatible API versions; Upgrade of tool is required\n"); + return -1; + } return 0; } @@ -1529,6 +1533,7 @@ static void cmdline(int argc, char **argv) { int opt; int option_index = 0; + int ret; static struct option long_options[] = { { "cpu", required_argument, 0, 'c' }, @@ -1590,13 +1595,14 @@ static void cmdline(int argc, char **argv) set_max_cpu_num(); set_cpu_present_cpu_mask(); set_cpu_target_cpu_mask(); - isst_fill_platform_info(); - if (isst_platform_info.api_version > supported_api_ver) { - printf("Incompatible API versions; Upgrade of tool is required\n"); - exit(0); - } + ret = isst_fill_platform_info(); + if (ret) + goto out; process_command(argc, argv); +out: + free_cpu_set(present_cpumask); + free_cpu_set(target_cpumask); } int main(int argc, char **argv) -- 2.20.1