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 1B2B6C2D0DB for ; Fri, 24 Jan 2020 14:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E42932071A for ; Fri, 24 Jan 2020 14:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579876699; bh=OpUBZL5ybbPdTleQ7Tq34gwcRNz1+6TS91I3X9ZpkjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=i6vQn+iec3MeK+lGLnh9OOjaJ6/eTArTXja3XZehQib+aVjQA2Iy7dI37JR8G3Cu+ xfd2tN6kDOwN2Ji2xqW7hJQf6NkCCtCrAQGHAaoGxdidhl/ehUhprG9BQJm8AoTvyg DjdVMayDS3ioQxDAb/ouPL9t81AZ5x+gHUC7qGPQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387821AbgAXOiR (ORCPT ); Fri, 24 Jan 2020 09:38:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:38706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389002AbgAXOSt (ORCPT ); Fri, 24 Jan 2020 09:18:49 -0500 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 5239620838; Fri, 24 Jan 2020 14:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875528; bh=OpUBZL5ybbPdTleQ7Tq34gwcRNz1+6TS91I3X9ZpkjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xW3e4MbMI4GMCfjlQf7ZUlJ+b6pZVMEKa05SV68wk2mt6u68E2rnYUkwtU2sgJqRB zo0UQV2IFHU+B4Sut9KKe24HPFwOEFpXIqRy+rn962oNQHUBsO1i8kjeTZlpci78L3 /1Nd4nQ6p5MOsmzLDK+A8Zh4e67p1CKMumRmsLj0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shakeel Butt , Borislav Petkov , Fenghua Yu , "H. Peter Anvin" , Ingo Molnar , Reinette Chatre , Thomas Gleixner , x86-ml , Sasha Levin Subject: [PATCH AUTOSEL 5.4 026/107] x86/resctrl: Fix potential memory leak Date: Fri, 24 Jan 2020 09:16:56 -0500 Message-Id: <20200124141817.28793-26-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124141817.28793-1-sashal@kernel.org> References: <20200124141817.28793-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shakeel Butt [ Upstream commit ab6a2114433a3b5b555983dcb9b752a85255f04b ] set_cache_qos_cfg() is leaking memory when the given level is not RDT_RESOURCE_L3 or RDT_RESOURCE_L2. At the moment, this function is called with only valid levels but move the allocation after the valid level checks in order to make it more robust and future proof. [ bp: Massage commit message. ] Fixes: 99adde9b370de ("x86/intel_rdt: Enable L2 CDP in MSR IA32_L2_QOS_CFG") Signed-off-by: Shakeel Butt Signed-off-by: Borislav Petkov Cc: Fenghua Yu Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Reinette Chatre Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20200102165844.133133-1-shakeelb@google.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 2e3b06d6bbc6d..dac7209a07084 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -1741,9 +1741,6 @@ static int set_cache_qos_cfg(int level, bool enable) struct rdt_domain *d; int cpu; - if (!zalloc_cpumask_var(&cpu_mask, GFP_KERNEL)) - return -ENOMEM; - if (level == RDT_RESOURCE_L3) update = l3_qos_cfg_update; else if (level == RDT_RESOURCE_L2) @@ -1751,6 +1748,9 @@ static int set_cache_qos_cfg(int level, bool enable) else return -EINVAL; + if (!zalloc_cpumask_var(&cpu_mask, GFP_KERNEL)) + return -ENOMEM; + r_l = &rdt_resources_all[level]; list_for_each_entry(d, &r_l->domains, list) { /* Pick one CPU from each domain instance to update MSR */ -- 2.20.1