Messages in this thread Patch in this message | | | Date | Wed, 06 Oct 2021 17:39:00 -0000 | From | "tip-bot2 for James Morse" <> | Subject | [tip: x86/urgent] x86/resctrl: Fix kfree() of the wrong type in domain_add_cpu() |
| |
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d4ebfca26dfab2803c31d68a30225be31b2f9ecf Gitweb: https://git.kernel.org/tip/d4ebfca26dfab2803c31d68a30225be31b2f9ecf Author: James Morse <james.morse@arm.com> AuthorDate: Fri, 17 Sep 2021 16:59:24 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Wed, 06 Oct 2021 18:45:27 +02:00
x86/resctrl: Fix kfree() of the wrong type in domain_add_cpu()
Commit in Fixes separated the architecture specific and filesystem parts of the resctrl domain structures.
This left the error paths in domain_add_cpu() kfree()ing the memory with the wrong type.
This will cause a problem if someone adds a new member to struct rdt_hw_domain meaning d_resctrl is no longer the first member.
Fixes: 792e0f6f789b ("x86/resctrl: Split struct rdt_domain") 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> Link: https://lkml.kernel.org/r/20210917165924.28254-1-james.morse@arm.com --- arch/x86/kernel/cpu/resctrl/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index b5de5a6..bb1c3f5 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -527,14 +527,14 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) rdt_domain_reconfigure_cdp(r); if (r->alloc_capable && domain_setup_ctrlval(r, d)) { - kfree(d); + kfree(hw_dom); return; } if (r->mon_capable && domain_setup_mon_state(r, d)) { kfree(hw_dom->ctrl_val); kfree(hw_dom->mbps_val); - kfree(d); + kfree(hw_dom); return; }
| |