Skip to contentSkip to conversation

gianfar: fix memory leak in gfar_parse_group error paths

PATCH In review Rosen Penev 2 participants 2 messages Jun 22

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gianfar: fix memory leak in gfar_parse_group error paths

In gfar_parse_group, if any allocation in the irqinfo[] loop fails, or if of_iomap fails, or if the IRQ parsing fails, the already- allocated irqinfo[] entries and mapped regs are not freed. The caller's free_gfar_dev cannot clean them up because priv->num_grps is only incremented after a successful return.

Fix by adding an err_out label that frees all successfully allocated irqinfo entries and unmaps regs if mapped. Track the number of allocated entries with 'allocated' and propagate the correct error code.

Fixes 46ceb60ca80fa ("gianfar: Add Multiple group Support")
Assisted-by opencode:big-pickle
---
 drivers/net/ethernet/freescale/gianfar.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +16 -5
index 3271de5844f84..12ebb207be0be 100644
@@ -502,17 +502,19 @@ static int gfar_parse_group(struct device_node *np,
 			    struct gfar_private *priv, const char *model)
 {
 	struct gfar_priv_grp *grp = &priv->gfargrp[priv->num_grps];
-	int i;
+	int err = -ENOMEM;
+	int i, allocated = 0;
 
 	for (i = 0; i < GFAR_NUM_IRQS; i++) {
 		grp->irqinfo[i] = kzalloc_obj(struct gfar_irqinfo);
 		if (!grp->irqinfo[i])
-			return -ENOMEM;
+			goto err_out;
+		allocated++;
 	}
 
 	grp->regs = of_iomap(np, 0);
 	if (!grp->regs)
-		return -ENOMEM;
+		goto err_out;
 
 	gfar_irq(grp, TX)->irq = irq_of_parse_and_map(np, 0);
 
@@ -522,8 +524,10 @@ static int gfar_parse_group(struct device_node *np,
 		gfar_irq(grp, ER)->irq = irq_of_parse_and_map(np, 2);
 		if (!gfar_irq(grp, TX)->irq ||
 		    !gfar_irq(grp, RX)->irq ||
-		    !gfar_irq(grp, ER)->irq)
-			return -EINVAL;
+		    !gfar_irq(grp, ER)->irq) {
+			err = -EINVAL;
+			goto err_out;
+		}
 	}
 
 	grp->priv = priv;
@@ -567,6 +571,13 @@ static int gfar_parse_group(struct device_node *np,
 	priv->num_grps++;
 
 	return 0;
+
+err_out:
+	for (i = 0; i < allocated; i++)
+		kfree(grp->irqinfo[i]);
+	if (grp->regs)
+		iounmap(grp->regs);
+	return err;
 }
 
 /* Reads the controller's registers to determine what interface
Signature · 1 line
2.54.0
#1 lore raw
Quoted 24 lines · Rosen Penev

In gfar_parse_group, if any allocation in the irqinfo[] loop fails, or if of_iomap fails, or if the IRQ parsing fails, the already- allocated irqinfo[] entries and mapped regs are not freed. The caller's free_gfar_dev cannot clean them up because priv->num_grps is only incremented after a successful return.

Fix by adding an err_out label that frees all successfully allocated irqinfo entries and unmaps regs if mapped. Track the number of allocated entries with 'allocated' and propagate the correct error code.

Fixes 46ceb60ca80fa ("gianfar: Add Multiple group Support")
Assisted-by opencode:big-pickle
---
 drivers/net/ethernet/freescale/gianfar.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +0 -0
index 3271de5844f84..12ebb207be0be 100644

drivers/net/ethernet/freescale/gianfar.c static int gfar_parse_group(struct device_node *np, · line 506

Quoted 6 lines
drivers/net/ethernet/freescale/gianfar.c +2 -1
@@ -502,17 +502,19 @@ static int gfar_parse_group(struct device_node *np,
                            struct gfar_private *priv, const char *model)
 {
        struct gfar_priv_grp *grp = &priv->gfargrp[priv->num_grps];
-       int i;
+       int err = -ENOMEM;
+       int i, allocated = 0;

Declarations should follow reverse xmas-tree fashion.
BTW, why num_grps cannot be incremented quicker? Not sure it can cause any issues, since all this is happening probe(), it should be safe to do that?
That way you could avoid cleaning up at two different places...

Quoted 47 lines
drivers/net/ethernet/freescale/gianfar.c +14 -5
        for (i = 0; i < GFAR_NUM_IRQS; i++) {
                grp->irqinfo[i] = kzalloc_obj(struct gfar_irqinfo);
                if (!grp->irqinfo[i])
-                       return -ENOMEM;
+                       goto err_out;
+               allocated++;
        }
 
        grp->regs = of_iomap(np, 0);
        if (!grp->regs)
-               return -ENOMEM;
+               goto err_out;
 
        gfar_irq(grp, TX)->irq = irq_of_parse_and_map(np, 0);
 
@@ -522,8 +524,10 @@ static int gfar_parse_group(struct device_node *np,
                gfar_irq(grp, ER)->irq = irq_of_parse_and_map(np, 2);
                if (!gfar_irq(grp, TX)->irq ||
                    !gfar_irq(grp, RX)->irq ||
-                   !gfar_irq(grp, ER)->irq)
-                       return -EINVAL;
+                   !gfar_irq(grp, ER)->irq) {
+                       err = -EINVAL;
+                       goto err_out;
+               }
        }
 
        grp->priv = priv;
@@ -567,6 +571,13 @@ static int gfar_parse_group(struct device_node *np,
        priv->num_grps++;
 
        return 0;
+
+err_out:
+       for (i = 0; i < allocated; i++)
+               kfree(grp->irqinfo[i]);
+       if (grp->regs)
+               iounmap(grp->regs);
+       return err;
 }
 
 /* Reads the controller's registers to determine what interface
--

2.54.0