irqchip/stm32: Fix init error handling

If there are any errors in stm32_exti_host_init() then it leads to a
NULL dereference in the callers.  The function should clean up after
itself.

Fixes: f9fc1745501e ("irqchip/stm32: Add host and driver data structures")
Reviewed-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
index 3a7e8905a97e..880e48947576 100644
--- a/drivers/irqchip/irq-stm32-exti.c
+++ b/drivers/irqchip/irq-stm32-exti.c
@@ -602,17 +602,24 @@ stm32_exti_host_data *stm32_exti_host_init(const struct stm32_exti_drv_data *dd,
                                         sizeof(struct stm32_exti_chip_data),
                                         GFP_KERNEL);
         if (!host_data->chips_data)
-                return NULL;
+                goto free_host_data;
 
         host_data->base = of_iomap(node, 0);
         if (!host_data->base) {
                 pr_err("%pOF: Unable to map registers\n", node);
-                return NULL;
+                goto free_chips_data;
         }
 
         stm32_host_data = host_data;
 
         return host_data;
+
+free_chips_data:
+        kfree(host_data->chips_data);
+free_host_data:
+        kfree(host_data);
+
+        return NULL;
 }
 
 static struct
@@ -664,10 +671,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,
         struct irq_domain *domain;
 
         host_data = stm32_exti_host_init(drv_data, node);
-        if (!host_data) {
-                ret = -ENOMEM;
-                goto out_free_mem;
-        }
+        if (!host_data)
+                return -ENOMEM;
 
         domain = irq_domain_add_linear(node, drv_data->bank_nr * IRQS_PER_BANK,
                                        &irq_exti_domain_ops, NULL);
@@ -724,7 +729,6 @@ out_free_domain:
         irq_domain_remove(domain);
 out_unmap:
         iounmap(host_data->base);
-out_free_mem:
         kfree(host_data->chips_data);
         kfree(host_data);
         return ret;
@@ -751,10 +755,8 @@ __init stm32_exti_hierarchy_init(const struct stm32_exti_drv_data *drv_data,
         }
 
         host_data = stm32_exti_host_init(drv_data, node);
-        if (!host_data) {
-                ret = -ENOMEM;
-                goto out_free_mem;
-        }
+        if (!host_data)
+                return -ENOMEM;
 
         for (i = 0; i < drv_data->bank_nr; i++)
                 stm32_exti_chip_init(host_data, i, node);
@@ -776,7 +778,6 @@ __init stm32_exti_hierarchy_init(const struct stm32_exti_drv_data *drv_data,
 
 out_unmap:
         iounmap(host_data->base);
-out_free_mem:
         kfree(host_data->chips_data);
         kfree(host_data);
         return ret;