diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2018-01-06 11:00:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-03 12:23:27 +0300 |
| commit | 7086ec8f0e63792ed25398d165a9f603b64e9853 (patch) | |
| tree | 45c6d59d6f8fb4ad332543391d35878b0e777eaf /drivers/net/phy/mdio-sun4i.c | |
| parent | cded2e6f1660449e34c8bd6740614ee35e6ebf23 (diff) | |
| download | linux-7086ec8f0e63792ed25398d165a9f603b64e9853.tar.xz | |
mdio-sun4i: Fix a memory leak
[ Upstream commit 56c0290202ab94a2f2780c449395d4ae8495fab4 ]
If the probing of the regulator is deferred, the memory allocated by
'mdiobus_alloc_size()' will be leaking.
It should be freed before the next call to 'sun4i_mdio_probe()' which will
reallocate it.
Fixes: 4bdcb1dd9feb ("net: Add MDIO bus driver for the Allwinner EMAC")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/phy/mdio-sun4i.c')
| -rw-r--r-- | drivers/net/phy/mdio-sun4i.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c index 135296508a7e..6425ce04d3f9 100644 --- a/drivers/net/phy/mdio-sun4i.c +++ b/drivers/net/phy/mdio-sun4i.c @@ -118,8 +118,10 @@ static int sun4i_mdio_probe(struct platform_device *pdev) data->regulator = devm_regulator_get(&pdev->dev, "phy"); if (IS_ERR(data->regulator)) { - if (PTR_ERR(data->regulator) == -EPROBE_DEFER) - return -EPROBE_DEFER; + if (PTR_ERR(data->regulator) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto err_out_free_mdiobus; + } dev_info(&pdev->dev, "no regulator found\n"); data->regulator = NULL; |