mpic_alloc() allocates struct mpic (and optionally the protected
sources bitmap) but does not free them when mpic_setup_error_int() or
irq_domain_create_linear() fails, leaking the memory.
Free the bitmap and the mpic in the common error path before
dropping the device node reference.
Fixes: 996983b75ceb ("powerpc/mpic: Search for open-pic device-tree node if
NULL")
Suggested-by: Sourabh Jain <[email protected]>
Signed-off-by: Jyoti Gupta <[email protected]>
Reviewed-by: Ritesh Harjani (IBM) <[email protected]>
Reviewed-by: Mukesh Kumar Chaurasiya (IBM) <[email protected]>
Reviewed-by: Amit Machhiwal <[email protected]>
---
Changelog:
v3->v4:
- Retain the FIXME comment about the leaked MPIC mappings (they are not
fixed for !CONFIG_PPC_DCR / !MPIC_USES_DCR), per Ritesh's feedback.
- Added Suggested-by tag.
- Collect Reviewed-by tags from Ritesh, Mukesh and Amit.
- Link to v3:
https://lore.kernel.org/all/[email protected]/
v2->v3:
- Introduce 'err_free_mpic' unwind label to cleanly free mpic and
mpic->protected.
- Link to v2:
https://lore.kernel.org/all/[email protected]/
---
arch/powerpc/sysdev/mpic.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 257886ec3f70..ab33992a8698 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1389,7 +1389,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
if (fsl_version >= 0x401) {
ret = mpic_setup_error_int(mpic, intvec_top - 13);
if (ret)
- return NULL;
+ goto err_free_mpic;
}
}
@@ -1489,11 +1489,11 @@ struct mpic * __init mpic_alloc(struct device_node
*node,
&mpic_host_ops, mpic);
/*
- * FIXME: The code leaks the MPIC object and mappings here; this
- * is very unlikely to fail but it ought to be fixed anyways.
+ * FIXME: The code leaks the MPIC mappings here; this is very unlikely
+ * to fail but it ought to be fixed anyways.
*/
if (mpic->irqhost == NULL)
- return NULL;
+ goto err_free_mpic;
/* Display version */
switch (greg_feature & MPIC_GREG_FEATURE_VERSION_MASK) {
@@ -1526,6 +1526,9 @@ struct mpic * __init mpic_alloc(struct device_node *node,
return mpic;
+err_free_mpic:
+ bitmap_free(mpic->protected);
+ kfree(mpic);
err_of_node_put:
of_node_put(node);
return NULL;
--
2.55.0