Skip to content

Commit 16f3a28

Browse files
leitaoPaolo Abeni
authored andcommitted
net: mediatek: Fix potential NULL pointer dereference in dummy net_device handling
Move the freeing of the dummy net_device from mtk_free_dev() to mtk_remove(). Previously, if alloc_netdev_dummy() failed in mtk_probe(), eth->dummy_dev would be NULL. The error path would then call mtk_free_dev(), which in turn called free_netdev() assuming dummy_dev was allocated (but it was not), potentially causing a NULL pointer dereference. By moving free_netdev() to mtk_remove(), we ensure it's only called when mtk_probe() has succeeded and dummy_dev is fully allocated. This addresses a potential NULL pointer dereference detected by Smatch[1]. Fixes: b209bd6 ("net: mediatek: mtk_eth_sock: allocate dummy net_device dynamically") Reported-by: Dan Carpenter <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ [1] Suggested-by: Dan Carpenter <[email protected]> Reviewed-by: Dan Carpenter <[email protected]> Signed-off-by: Breno Leitao <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent e6d08d7 commit 16f3a28

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/net/ethernet/mediatek/mtk_eth_soc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4223,8 +4223,6 @@ static int mtk_free_dev(struct mtk_eth *eth)
42234223
metadata_dst_free(eth->dsa_meta[i]);
42244224
}
42254225

4226-
free_netdev(eth->dummy_dev);
4227-
42284226
return 0;
42294227
}
42304228

@@ -5090,6 +5088,7 @@ static void mtk_remove(struct platform_device *pdev)
50905088
netif_napi_del(&eth->tx_napi);
50915089
netif_napi_del(&eth->rx_napi);
50925090
mtk_cleanup(eth);
5091+
free_netdev(eth->dummy_dev);
50935092
mtk_mdio_cleanup(eth);
50945093
}
50955094

0 commit comments

Comments
 (0)