Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ramips: mtk_eth_soc: fix NULL pointer dereference for syncp

Browse source 
u64_stats_init() has been unable to handle NULL pointer since
6.1 kernel. This patch fixes kernel oops on mt76x8 and rt305x
sub-target.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
This commit is contained in:
Shiji Yang 2024-02-10 20:35:46 +08:00 committed by Nick Hainke
parent 3b74ae780c
commit 88d1322fcf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c
View file

@ -1601,6 +1601,7 @@ static int fe_probe(struct platform_device *pdev)
goto err_free_dev; goto err_free_dev;
} }
spin_lock_init(&priv->hw_stats->stats_lock); spin_lock_init(&priv->hw_stats->stats_lock);
u64_stats_init(&priv->hw_stats->syncp);
} }
sysclk = devm_clk_get(&pdev->dev, NULL); sysclk = devm_clk_get(&pdev->dev, NULL);
@ -1628,7 +1629,6 @@ static int fe_probe(struct platform_device *pdev)
priv->tx_ring.tx_ring_size = NUM_DMA_DESC; priv->tx_ring.tx_ring_size = NUM_DMA_DESC;
priv->rx_ring.rx_ring_size = NUM_DMA_DESC; priv->rx_ring.rx_ring_size = NUM_DMA_DESC;
INIT_WORK(&priv->pending_work, fe_pending_work); INIT_WORK(&priv->pending_work, fe_pending_work);
u64_stats_init(&priv->hw_stats->syncp);
napi_weight = 16; napi_weight = 16;
if (priv->flags & FE_FLAG_NAPI_WEIGHT) { if (priv->flags & FE_FLAG_NAPI_WEIGHT) {