gianfar: free/iounmap memory after an error in mii bus initialization
Subsystems (2)
PATCH 10/10 gianfar: free/iounmap memory after an error in mii bus initialization
From: Andy Fleming <[email protected]>
Recent changes to MII bus initialization code added exit points which didn't free or iounmap the bus before returning.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11372.
Signed-off-by Andy Fleming <[email protected]>
Reported-by Daniel Marjamki <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/gianfar_mii.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/gianfar_mii.c renamed from drivers/net/gianfar_mii.c~gianfar-free-iounmap-memory-after-an-error-in-mii-bus-initialization +8 -6
@@ -211,19 +211,21 @@ static int gfar_mdio_probe(struct devicegfar_write (&enet_regs->tbipa,0 );for (i =PHY_MAX_ADDR ; i >0 ; i--) {u32 phy_id; -int r; - r =get_phy_id (new_bus, i, &phy_id); -if (r) -return r; + err =get_phy_id (new_bus, i, &phy_id); +if (err) + goto bus_register_fail;if (phy_id ==0xffffffff )break ; }/* The bus is full. We don't support using 31 PHYs, sorry */ -if (i ==0 ) -return -EBUSY ; +if (i ==0 ) { + err = -EBUSY ; + + goto bus_register_fail; + }gfar_write (&enet_regs->tbipa, i);
_
Jeff Garzik
AppliedQuoted 36 lines · [email protected] wrote:
From: Andy Fleming <[email protected]>
Recent changes to MII bus initialization code added exit points which didn't free or iounmap the bus before returning.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11372.
Signed-off-by Andy Fleming <[email protected]>Reported-by Daniel Marjamki <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/net/gianfar_mii.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)diff -puN
drivers/net/gianfar_mii.c~gianfar-free-iounmap-memory-after-an-error-in-mii-bus-initializationdrivers/net/gianfar_mii.cdrivers/net/gianfar_mii.c renamed from drivers/net/gianfar_mii.c~gianfar-free-iounmap-memory-after-an-error-in-mii-bus-initialization +3
-4@@ -211,19 +211,21 @@ static int gfar_mdio_probe(struct devicegfar_write (&enet_regs->tbipa,0 );for (i =PHY_MAX_ADDR ; i >0 ; i--) {u32 phy_id; -int r; - r =get_phy_id (new_bus, i, &phy_id); -if (r) -return r; + err =get_phy_id (new_bus, i, &phy_id); +if (err) + goto bus_register_fail;if (phy_id ==0xffffffff )break ; }
drivers/net/gianfar_mii.c static int gfar_mdio_probe(struct device · line 230
Quoted 10 lines
drivers/net/gianfar_mii.c renamed from drivers/net/gianfar_mii.c~gianfar-free-iounmap-memory-after-an-error-in-mii-bus-initialization +5
-2/* The bus is full. We don't support using 31 PHYs, sorry */ -if (i ==0 ) -return -EBUSY ; +if (i ==0 ) { + err = -EBUSY ; + + goto bus_register_fail; + }gfar_write (&enet_regs->tbipa, i);
applied