lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 02 Jan 2020 17:31:38 -0000 From: "tip-bot2 for Shakeel Butt" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: Shakeel Butt <shakeelb@...gle.com>, Borislav Petkov <bp@...e.de>, Fenghua Yu <fenghua.yu@...el.com>, "H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...hat.com>, Reinette Chatre <reinette.chatre@...el.com>, Thomas Gleixner <tglx@...utronix.de>, "x86-ml" <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: x86/urgent] x86/resctrl: Fix potential memory leak The following commit has been merged into the x86/urgent branch of tip: Commit-ID: ab6a2114433a3b5b555983dcb9b752a85255f04b Gitweb: https://git.kernel.org/tip/ab6a2114433a3b5b555983dcb9b752a85255f04b Author: Shakeel Butt <shakeelb@...gle.com> AuthorDate: Thu, 02 Jan 2020 08:58:44 -08:00 Committer: Borislav Petkov <bp@...e.de> CommitterDate: Thu, 02 Jan 2020 18:26:27 +01:00 x86/resctrl: Fix potential memory leak 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 <shakeelb@...gle.com> Signed-off-by: Borislav Petkov <bp@...e.de> Cc: Fenghua Yu <fenghua.yu@...el.com> Cc: "H. Peter Anvin" <hpa@...or.com> Cc: Ingo Molnar <mingo@...hat.com> Cc: Reinette Chatre <reinette.chatre@...el.com> Cc: Thomas Gleixner <tglx@...utronix.de> Cc: x86-ml <x86@...nel.org> Link: https://lkml.kernel.org/r/20200102165844.133133-1-shakeelb@google.com --- 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 2e3b06d..dac7209 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 */
Powered by blists - more mailing lists