* [PATCH] powerpc/xive: Fix refcount leak in xive_spapr_init
@ 2022-05-12 9:05 Miaoqian Lin
2022-05-12 16:14 ` Cédric Le Goater
2022-05-24 11:09 ` Michael Ellerman
0 siblings, 2 replies; 3+ messages in thread
From: Miaoqian Lin @ 2022-05-12 9:05 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras,
Cédric Le Goater, Nick Child, Christophe JAILLET,
Ammar Faizi, Miaoqian Lin, linuxppc-dev, linux-kernel
of_find_compatible_node() returns a node pointer with refcount
incremented, we should use of_node_put() on it when done.
Add missing of_node_put() to avoid refcount leak.
Fixes: eac1e731b59e ("powerpc/xive: guest exploitation of the XIVE interrupt controller")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
arch/powerpc/sysdev/xive/spapr.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
index 29456c255f9f..503f544d28e2 100644
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -830,12 +830,12 @@ bool __init xive_spapr_init(void)
/* Resource 1 is the OS ring TIMA */
if (of_address_to_resource(np, 1, &r)) {
pr_err("Failed to get thread mgmnt area resource\n");
- return false;
+ goto err_put;
}
tima = ioremap(r.start, resource_size(&r));
if (!tima) {
pr_err("Failed to map thread mgmnt area\n");
- return false;
+ goto err_put;
}
if (!xive_get_max_prio(&max_prio))
@@ -871,6 +871,7 @@ bool __init xive_spapr_init(void)
if (!xive_core_init(np, &xive_spapr_ops, tima, TM_QW1_OS, max_prio))
goto err_mem_free;
+ of_node_put(np);
pr_info("Using %dkB queues\n", 1 << (xive_queue_shift - 10));
return true;
@@ -878,6 +879,8 @@ bool __init xive_spapr_init(void)
xive_irq_bitmap_remove_all();
err_unmap:
iounmap(tima);
+err_put:
+ of_node_put(np);
return false;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] powerpc/xive: Fix refcount leak in xive_spapr_init
2022-05-12 9:05 [PATCH] powerpc/xive: Fix refcount leak in xive_spapr_init Miaoqian Lin
@ 2022-05-12 16:14 ` Cédric Le Goater
2022-05-24 11:09 ` Michael Ellerman
1 sibling, 0 replies; 3+ messages in thread
From: Cédric Le Goater @ 2022-05-12 16:14 UTC (permalink / raw)
To: Miaoqian Lin, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Nick Child, Christophe JAILLET, Ammar Faizi,
linuxppc-dev, linux-kernel
On 5/12/22 11:05, Miaoqian Lin wrote:
> of_find_compatible_node() returns a node pointer with refcount
> incremented, we should use of_node_put() on it when done.
> Add missing of_node_put() to avoid refcount leak.
>
> Fixes: eac1e731b59e ("powerpc/xive: guest exploitation of the XIVE interrupt controller")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> arch/powerpc/sysdev/xive/spapr.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
> index 29456c255f9f..503f544d28e2 100644
> --- a/arch/powerpc/sysdev/xive/spapr.c
> +++ b/arch/powerpc/sysdev/xive/spapr.c
> @@ -830,12 +830,12 @@ bool __init xive_spapr_init(void)
> /* Resource 1 is the OS ring TIMA */
> if (of_address_to_resource(np, 1, &r)) {
> pr_err("Failed to get thread mgmnt area resource\n");
> - return false;
> + goto err_put;
> }
> tima = ioremap(r.start, resource_size(&r));
> if (!tima) {
> pr_err("Failed to map thread mgmnt area\n");
> - return false;
> + goto err_put;
> }
>
> if (!xive_get_max_prio(&max_prio))
> @@ -871,6 +871,7 @@ bool __init xive_spapr_init(void)
> if (!xive_core_init(np, &xive_spapr_ops, tima, TM_QW1_OS, max_prio))
> goto err_mem_free;
>
> + of_node_put(np);
> pr_info("Using %dkB queues\n", 1 << (xive_queue_shift - 10));
> return true;
>
> @@ -878,6 +879,8 @@ bool __init xive_spapr_init(void)
> xive_irq_bitmap_remove_all();
> err_unmap:
> iounmap(tima);
> +err_put:
> + of_node_put(np);
> return false;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] powerpc/xive: Fix refcount leak in xive_spapr_init
2022-05-12 9:05 [PATCH] powerpc/xive: Fix refcount leak in xive_spapr_init Miaoqian Lin
2022-05-12 16:14 ` Cédric Le Goater
@ 2022-05-24 11:09 ` Michael Ellerman
1 sibling, 0 replies; 3+ messages in thread
From: Michael Ellerman @ 2022-05-24 11:09 UTC (permalink / raw)
To: Miaoqian Lin, Cédric Le Goater, linux-kernel, Ammar Faizi,
Nick Child, Michael Ellerman, Benjamin Herrenschmidt,
Christophe JAILLET, Paul Mackerras, linuxppc-dev
On Thu, 12 May 2022 13:05:33 +0400, Miaoqian Lin wrote:
> of_find_compatible_node() returns a node pointer with refcount
> incremented, we should use of_node_put() on it when done.
> Add missing of_node_put() to avoid refcount leak.
>
>
Applied to powerpc/next.
[1/1] powerpc/xive: Fix refcount leak in xive_spapr_init
https://git.kernel.org/powerpc/c/1d1fb9618bdd5a5fbf9a9eb75133da301d33721c
cheers
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-24 11:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-12 9:05 [PATCH] powerpc/xive: Fix refcount leak in xive_spapr_init Miaoqian Lin
2022-05-12 16:14 ` Cédric Le Goater
2022-05-24 11:09 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).