Commit 533bec14 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Stefano Stabellini

arm/xen: Fix some refcount leaks

The of_find_compatible_node() function returns a node pointer with
refcount incremented, We should use of_node_put() on it when done
Add the missing of_node_put() to release the refcount.

Fixes: 9b08aaa3 ("ARM: XEN: Move xen_early_init() before efi_init()")
Fixes: b2371587 ("arm/xen: Read extended regions from DT and init Xen resource")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@xilinx.com>
parent f31076a6
...@@ -337,12 +337,15 @@ int __init arch_xen_unpopulated_init(struct resource **res) ...@@ -337,12 +337,15 @@ int __init arch_xen_unpopulated_init(struct resource **res)
if (!nr_reg) { if (!nr_reg) {
pr_err("No extended regions are found\n"); pr_err("No extended regions are found\n");
of_node_put(np);
return -EINVAL; return -EINVAL;
} }
regs = kcalloc(nr_reg, sizeof(*regs), GFP_KERNEL); regs = kcalloc(nr_reg, sizeof(*regs), GFP_KERNEL);
if (!regs) if (!regs) {
of_node_put(np);
return -ENOMEM; return -ENOMEM;
}
/* /*
* Create resource from extended regions provided by the hypervisor to be * Create resource from extended regions provided by the hypervisor to be
...@@ -403,8 +406,8 @@ int __init arch_xen_unpopulated_init(struct resource **res) ...@@ -403,8 +406,8 @@ int __init arch_xen_unpopulated_init(struct resource **res)
*res = &xen_resource; *res = &xen_resource;
err: err:
of_node_put(np);
kfree(regs); kfree(regs);
return rc; return rc;
} }
#endif #endif
...@@ -424,8 +427,10 @@ static void __init xen_dt_guest_init(void) ...@@ -424,8 +427,10 @@ static void __init xen_dt_guest_init(void)
if (of_address_to_resource(xen_node, GRANT_TABLE_INDEX, &res)) { if (of_address_to_resource(xen_node, GRANT_TABLE_INDEX, &res)) {
pr_err("Xen grant table region is not found\n"); pr_err("Xen grant table region is not found\n");
of_node_put(xen_node);
return; return;
} }
of_node_put(xen_node);
xen_grant_frames = res.start; xen_grant_frames = res.start;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment