mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-28 12:53:14 +01:00
net: ethoc: move setting of netops to fix crash
ethoc_probe() calls ethoc_mdio_probe(), which connects the PHY, before netdev->netdev_ops is assigned. phy_attach_direct() -> phy_link_topo_add_phy() reads dev->netdev_ops through netdev_need_ops_lock() since the commit in question, so probing crashes with a NULL pointer dereference when CONFIG_NET_SHAPER is enabled. Assign netdev_ops before the PHY attach, as was done for emac in commit7c9f391ec8("net: emac: move setting of netops to fix crash"). Fixes:ded86da4bb("net: ethtool: relax ethnl_req_get_phydev() locking assertion") Signed-off-by: David Yang <[email protected]> Reviewed-by: Maxime Chevallier <[email protected]> Reviewed-by: Daniel Machon <[email protected]> Link: https://patch.msgid.link/[email protected] Reviewed-by: Jijie Shao <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
This commit is contained in:
1 parent
beabbafdd0
commit
c9f8ce62a5
1 file changed
+2
-1
@@ -1211,6 +1211,8 @@ static int ethoc_probe(struct platform_device *pdev)
|
||||
goto free3;
|
||||
}
|
||||
|
||||
netdev->netdev_ops = ðoc_netdev_ops;
|
||||
|
||||
ret = ethoc_mdio_probe(netdev);
|
||||
if (ret) {
|
||||
dev_err(&netdev->dev, "failed to probe MDIO bus\n");
|
||||
@@ -1218,7 +1220,6 @@ static int ethoc_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
/* setup the net_device structure */
|
||||
netdev->netdev_ops = ðoc_netdev_ops;
|
||||
netdev->watchdog_timeo = ETHOC_TIMEOUT;
|
||||
netdev->features |= 0;
|
||||
netdev->ethtool_ops = ðoc_ethtool_ops;
|
||||
|
||||
Reference in new issue
Block a user