mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-10-28 12:53:14 +01:00
net: ethernet: adi: Move setting of netops to fix crash
adin1140_probe() calls adin1140_phy_init(), 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: Ciprian Regus <[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
c2c4824319
commit
ea1565cbf0
1 file changed
+2
-1
@@ -733,6 +733,8 @@ static int adin1140_probe(struct spi_device *spi)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
netdev->netdev_ops = &adin1140_netdev_ops;
|
||||
|
||||
ret = adin1140_phy_init(priv, spi);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -748,7 +750,6 @@ static int adin1140_probe(struct spi_device *spi)
|
||||
|
||||
netdev->if_port = IF_PORT_10BASET;
|
||||
netdev->irq = spi->irq;
|
||||
netdev->netdev_ops = &adin1140_netdev_ops;
|
||||
netdev->ethtool_ops = &adin1140_ethtool_ops;
|
||||
netdev->netns_immutable = true;
|
||||
netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE |
|
||||
|
||||
Reference in new issue
Block a user