Skip to content

Commit 35d3e1c

Browse files
committed
ethtool: check device is present when getting link settings
jira LE-2169 Rebuild_History Non-Buildable kernel-4.18.0-553.27.1.el8_10 commit-author Jamie Bainbridge <[email protected]> commit a699781 A sysfs reader can race with a device reset or removal, attempting to read device state when the device is not actually present. eg: [exception RIP: qed_get_current_link+17] #8 [ffffb9e4f2907c48] qede_get_link_ksettings at ffffffffc07a994a [qede] #9 [ffffb9e4f2907cd8] __rh_call_get_link_ksettings at ffffffff992b01a3 #10 [ffffb9e4f2907d38] __ethtool_get_link_ksettings at ffffffff992b04e4 #11 [ffffb9e4f2907d90] duplex_show at ffffffff99260300 #12 [ffffb9e4f2907e38] dev_attr_show at ffffffff9905a01c #13 [ffffb9e4f2907e50] sysfs_kf_seq_show at ffffffff98e0145b #14 [ffffb9e4f2907e68] seq_read at ffffffff98d902e3 #15 [ffffb9e4f2907ec8] vfs_read at ffffffff98d657d1 #16 [ffffb9e4f2907f00] ksys_read at ffffffff98d65c3f #17 [ffffb9e4f2907f38] do_syscall_64 at ffffffff98a052fb crash> struct net_device.state ffff9a9d21336000 state = 5, state 5 is __LINK_STATE_START (0b1) and __LINK_STATE_NOCARRIER (0b100). The device is not present, note lack of __LINK_STATE_PRESENT (0b10). This is the same sort of panic as observed in commit 4224cfd ("net-sysfs: add check for netdevice being present to speed_show"). There are many other callers of __ethtool_get_link_ksettings() which don't have a device presence check. Move this check into ethtool to protect all callers. Fixes: d519e17 ("net: export device speed and duplex via sysfs") Fixes: 4224cfd ("net-sysfs: add check for netdevice being present to speed_show") Signed-off-by: Jamie Bainbridge <[email protected]> Link: https://patch.msgid.link/8bae218864beaa44ed01628140475b9bf641c5b0.1724393671.git.jamie.bainbridge@gmail.com Signed-off-by: Jakub Kicinski <[email protected]> (cherry picked from commit a699781) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 233bb97 commit 35d3e1c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

net/core/net-sysfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static ssize_t speed_show(struct device *dev,
221221
if (!rtnl_trylock())
222222
return restart_syscall();
223223

224-
if (netif_running(netdev) && netif_device_present(netdev)) {
224+
if (netif_running(netdev)) {
225225
struct ethtool_link_ksettings cmd;
226226

227227
if (!__ethtool_get_link_ksettings(netdev, &cmd))

net/ethtool/ioctl.c

+3
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,9 @@ int __ethtool_get_link_ksettings(struct net_device *dev,
484484
return err;
485485
}
486486

487+
if (!netif_device_present(dev))
488+
return -ENODEV;
489+
487490
memset(link_ksettings, 0, sizeof(*link_ksettings));
488491
return __rh_call_get_link_ksettings(dev, link_ksettings);
489492
}

0 commit comments

Comments
 (0)