]> git.baikalelectronics.ru Git - kernel.git/commitdiff
x86/resctrl: Fix kfree() of the wrong type in domain_add_cpu()
authorJames Morse <james.morse@arm.com>
Fri, 17 Sep 2021 16:59:24 +0000 (16:59 +0000)
committerBorislav Petkov <bp@suse.de>
Wed, 6 Oct 2021 16:45:27 +0000 (18:45 +0200)
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: e4768d23c57b ("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

index b5de5a6c115c8329f0bc753b64f66e57f44b99a5..bb1c3f5f60c81d3969e0c84e269f3f4883dd0467 100644 (file)
@@ -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;
        }