Skip to content

Commit af6bd5c

Browse files
leitaogregkh
authored andcommitted
net: mediatek: Fix potential NULL pointer dereference in dummy net_device handling
[ Upstream commit 16f3a28 ] 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 <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/all/4160f4e0-cbef-4a22-8b5d-42c4d399e1f7@stanley.mountain/ [1] Suggested-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20240724080524.2734499-1-leitao@debian.org Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a13d386 commit af6bd5c

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/net/ethernet/mediatek/mtk_eth_soc.c

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

4201-
free_netdev(eth->dummy_dev);
4202-
42034201
return 0;
42044202
}
42054203

@@ -5048,6 +5046,7 @@ static void mtk_remove(struct platform_device *pdev)
50485046
netif_napi_del(&eth->tx_napi);
50495047
netif_napi_del(&eth->rx_napi);
50505048
mtk_cleanup(eth);
5049+
free_netdev(eth->dummy_dev);
50515050
mtk_mdio_cleanup(eth);
50525051
}
50535052

0 commit comments

Comments
 (0)