x86/resctrl: Fix potential memory leak
Subsystems (2)
PATCH v3 1/1 x86/resctrl: Fix potential memory leak
The set_cache_qos_cfg() is leaking memory when the given level is not RDT_RESOURCE_L3 or RDT_RESOURCE_L2. However at the moment, this function is called with only valid levels but to make it more robust and future proof, we should be handling the error path gracefully. So, moving the allocation after the valid level checks.
---
Changes since v2:
- Move the allocation after validity checks
Changes since v1:
- Updated the commit message
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +3 -3
@@ -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 */
Signature · 1 line
2.24.1.735.g03f4e72817-goog
The following commit has been merged into the x86/urgent branch of tip:
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 <[email protected]> AuthorDate: Thu, 02 Jan 2020 08:58:44 -08:00 Committer: Borislav Petkov <[email protected]> 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. ]
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +3 -3
@@ -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 */