mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	"David S . Miller" <davem@davemloft.net>,
	Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 3.18 19/24] mdio-sun4i: Fix a memory leak
Date: Sat, 3 Feb 2018 18:05:08 +0000	[thread overview]
Message-ID: <20180203180444.10801-19-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180203180444.10801-1-alexander.levin@microsoft.com>

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>
---
 drivers/net/phy/mdio-sun4i.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c
index 15bc7f9ea224..afd76e07088b 100644
--- a/drivers/net/phy/mdio-sun4i.c
+++ b/drivers/net/phy/mdio-sun4i.c
@@ -128,8 +128,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");
 	} else {
-- 
2.11.0

  parent reply	other threads:[~2018-02-03 18:08 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-03 18:04 [PATCH AUTOSEL for 3.18 01/24] mtd: nand: gpmi: Fix failure when a erased page has a bitflip at BBM Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 3.18 02/24] ipv6: icmp6: Allow icmp messages to be looped back Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 3.18 03/24] mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed Sasha Levin
2018-02-03 18:04 ` [PATCH AUTOSEL for 3.18 04/24] sget(): handle failures of register_shrinker() Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 05/24] spi: atmel: fixed spin_lock usage inside atmel_spi_remove Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 06/24] net: arc_emac: fix arc_emac_rx() error paths Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 07/24] scsi: storvsc: Fix scsi_cmd error assignments in storvsc_handle_error Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 08/24] tg3: Add workaround to restrict 5762 MRRS to 2048 Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 09/24] tg3: Enable PHY reset in MTU change path for 5720 Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 10/24] bnx2x: Improve reliability in case of nested PCI errors Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 11/24] led: core: Fix brightness setting when setting delay_off=0 Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 12/24] s390/dasd: fix wrongly assigned configuration data Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 13/24] xfs: quota: fix missed destroy of qi_tree_lock Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 14/24] xfs: quota: check result of register_shrinker() Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 15/24] e1000: fix disabling already-disabled warning Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 16/24] drm/ttm: check the return value of kzalloc Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 17/24] loop: fix concurrent lo_open/lo_release Sasha Levin
2018-02-03 18:05 ` Sasha Levin [this message]
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 18/24] xen-netfront: enable device after manual module load Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 20/24] SolutionEngine771x: fix Ether platform data Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 21/24] xen/gntdev: Fix off-by-one error when unmapping with holes Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 23/24] sctp: make use of pre-calculated len Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 22/24] xen/gntdev: Fix partial gntdev_mmap() cleanup Sasha Levin
2018-02-03 18:05 ` [PATCH AUTOSEL for 3.18 24/24] net: gianfar_ptp: move set_fipers() to spinlock protecting area Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180203180444.10801-19-alexander.levin@microsoft.com \
    --to=alexander.levin@microsoft.com \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®