Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85e1d426 authored by Kamal Heib's avatar Kamal Heib Committed by Greg Kroah-Hartman
Browse files

staging: mt7621-eth: Fix memory leak in mtk_add_mac() error path 



Fix memory leak in error path of mtk_add_mac() by make sure to free
the allocated netdev.

Fixes: e3cbf478 ('staging: mt7621-eth: add the drivers core files')
Signed-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0233204

drivers/staging/mt7621-eth/mtk_eth_soc.c

+10 −3
Original line number Diff line number Diff line
@@ -2012,8 +2012,10 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) 
		mac->hw_stats = devm_kzalloc(eth->dev,

					     sizeof(*mac->hw_stats),

					     GFP_KERNEL);

		if (!mac->hw_stats)

			return -ENOMEM;

		if (!mac->hw_stats) {

			err = -ENOMEM;

			goto free_netdev;

		}

		spin_lock_init(&mac->hw_stats->stats_lock);

		mac->hw_stats->reg_offset = id * MTK_STAT_OFFSET;

	}
@@ -2037,7 +2039,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) 
	err = register_netdev(eth->netdev[id]);

	if (err) {

		dev_err(eth->dev, "error bringing up device\n");

		return err;

		err = -ENOMEM;

		goto free_netdev;

	}

	eth->netdev[id]->irq = eth->irq;

	netif_info(eth, probe, eth->netdev[id],
@@ -2045,6 +2048,10 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) 
		   eth->netdev[id]->base_addr, eth->netdev[id]->irq);



	return 0;



free_netdev:

	free_netdev(eth->netdev[id]);

	return err;

}



static int mtk_probe(struct platform_device *pdev)