Commit e1c38c2f authored May 13, 2021 by Christophe JAILLET Committed by Greg Kroah-Hartman Jun 03, 2021

net: mdio: octeon: Fix some double free issues



[ Upstream commit e1d027dd97e1e750669cdc0d3b016a4f54e473eb ]

'bus->mii_bus' has been allocated with 'devm_mdiobus_alloc_size()' in the
probe function. So it must not be freed explicitly or there will be a
double free.

Remove the incorrect 'mdiobus_free' in the error handling path of the
probe function and in remove function.

Suggested-By: Andrew Lunn <andrew@lunn.ch>
Fixes: 35d2aeac ("phy: mdio-octeon: Use devm_mdiobus_alloc_size()")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent f97bec56

drivers/net/phy/mdio-octeon.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ static int octeon_mdiobus_probe(struct platform_device *pdev)

		return 0;
		fail_register:
		mdiobus_free(bus->mii_bus);
		smi_en.u64 = 0;
		oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN);
		return err;
		@@ -89,7 +88,6 @@ static int octeon_mdiobus_remove(struct platform_device *pdev)
		bus = platform_get_drvdata(pdev);

		mdiobus_unregister(bus->mii_bus);
		mdiobus_free(bus->mii_bus);
		smi_en.u64 = 0;
		oct_mdio_writeq(smi_en.u64, bus->register_base + SMI_EN);
		return 0;