lkml.org 
[lkml]   [2021]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: x86/urgent] x86/resctrl: Free the ctrlval arrays when domain_setup_mon_state() fails
The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: 64e87d4bd3201bf8a4685083ee4daf5c0d001452
Gitweb: https://git.kernel.org/tip/64e87d4bd3201bf8a4685083ee4daf5c0d001452
Author: James Morse <james.morse@arm.com>
AuthorDate: Fri, 17 Sep 2021 16:59:58
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 06 Oct 2021 18:45:21 +02:00

x86/resctrl: Free the ctrlval arrays when domain_setup_mon_state() fails

domain_add_cpu() is called whenever a CPU is brought online. The
earlier call to domain_setup_ctrlval() allocates the control value
arrays.

If domain_setup_mon_state() fails, the control value arrays are not
freed.

Add the missing kfree() calls.

Fixes: 1bd2a63b4f0de ("x86/intel_rdt/mba_sc: Add initialization support")
Fixes: edf6fa1c4a951 ("x86/intel_rdt/cqm: Add RMID (Resource monitoring ID) management")
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Reinette Chatre <reinette.chatre@intel.com>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20210917165958.28313-1-james.morse@arm.com
---
arch/x86/kernel/cpu/resctrl/core.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 4b8813b..b5de5a6 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -532,6 +532,8 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r)
}

if (r->mon_capable && domain_setup_mon_state(r, d)) {
+ kfree(hw_dom->ctrl_val);
+ kfree(hw_dom->mbps_val);
kfree(d);
return;
}
\
 
 \ /
  Last update: 2021-10-06 19:39    [W:4.612 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site