From patchwork Sun Mar 15 16:58:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 243654 List-Id: U-Boot discussion From: marek.vasut at gmail.com (Marek Vasut) Date: Sun, 15 Mar 2020 17:58:36 +0100 Subject: [PATCH 05/12] net: smc911x: Fix potential memleak() in init fail path In-Reply-To: <20200315165843.81753-1-marek.vasut+renesas@gmail.com> References: <20200315165843.81753-1-marek.vasut+renesas@gmail.com> Message-ID: <20200315165843.81753-6-marek.vasut+renesas@gmail.com> Fix memleak in the init fail path, where if allocation or registration of MDIO bus fails, then ethernet interface is not unregistered and the private data are not freed, yet the probe function reports a failure. Signed-off-by: Marek Vasut Cc: Joe Hershberger Cc: Masahiro Yamada Acked-by: Joe Hershberger --- drivers/net/smc911x.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 81f8f0d017..44cb45af61 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -249,7 +249,7 @@ int smc911x_initialize(u8 dev_num, int base_addr) dev = calloc(1, sizeof(*dev)); if (!dev) { - return -1; + return -ENODEV; } dev->iobase = base_addr; @@ -283,15 +283,23 @@ int smc911x_initialize(u8 dev_num, int base_addr) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) int retval; struct mii_dev *mdiodev = mdio_alloc(); - if (!mdiodev) + if (!mdiodev) { + eth_unregister(dev); + free(dev); return -ENOMEM; + } + strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); mdiodev->read = smc911x_miiphy_read; mdiodev->write = smc911x_miiphy_write; retval = mdio_register(mdiodev); - if (retval < 0) + if (retval < 0) { + mdio_free(mdiodev); + eth_unregister(dev); + free(dev); return retval; + } #endif return 1;