| From foo@baz Wed Feb 28 16:16:23 CET 2018 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Sat, 6 Jan 2018 09:00:09 +0100 |
| Subject: mdio-sun4i: Fix a memory leak |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| |
| [ 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> |
| --- |
| drivers/net/phy/mdio-sun4i.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/phy/mdio-sun4i.c |
| +++ b/drivers/net/phy/mdio-sun4i.c |
| @@ -128,8 +128,10 @@ static int sun4i_mdio_probe(struct platf |
| |
| 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"); |
| } else { |
