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=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 D8454C2D0DB for ; Fri, 24 Jan 2020 14:31:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A83DF206F0 for ; Fri, 24 Jan 2020 14:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579876263; bh=/IiXlaG9WEJyyLDQ4WYbK2Bc4QgiTbo8sl7iizV2S7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JyqaudgqjTT/89Cet9MJUp3127mvqP4XlDngwBlCBfhd5UDQELF6wSgsJc0Mi7mcL AkDOcIWMCBDZcjoRcYXBRnZYBpTJ1mSoY5wxQNGdq0vUDEtqsWIXHUhKuB2QwK8oEh vNJ3IPM/Nn20j4oWcv36bR+S4ajrsc5yB38Ux9xw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404872AbgAXOUc (ORCPT ); Fri, 24 Jan 2020 09:20:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:41598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404862AbgAXOUb (ORCPT ); Fri, 24 Jan 2020 09:20:31 -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 CC8B522464; Fri, 24 Jan 2020 14:20:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579875630; bh=/IiXlaG9WEJyyLDQ4WYbK2Bc4QgiTbo8sl7iizV2S7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rUFFBNAZ5fn5/12QoRQLcjbh6tdTKmq6DBo3jCapOgh4oas9Ijp1gWURrYY2HfZmz MBInD6vnoL5n7wr7GLl3Dj4mGwb6xdYHozIZHN0t5rzGP4+uNlrhhz2jlwK5jRp8sw vZC2loCcKCeHSVyKlEzHPOd/0mCSCrmeIHV8FsHg= 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 4.19 15/56] x86/resctrl: Fix potential memory leak Date: Fri, 24 Jan 2020 09:19:31 -0500 Message-Id: <20200124142012.29752-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200124142012.29752-1-sashal@kernel.org> References: <20200124142012.29752-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/intel_rdt_rdtgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c index a2d7e6646cce8..841a0246eb897 100644 --- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c @@ -1749,9 +1749,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) @@ -1759,6 +1756,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