Skip to content

Commit a699781

Browse files
superjamiekuba-moo
authored andcommitted
ethtool: check device is present when getting link settings
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] torvalds#8 [ffffb9e4f2907c48] qede_get_link_ksettings at ffffffffc07a994a [qede] torvalds#9 [ffffb9e4f2907cd8] __rh_call_get_link_ksettings at ffffffff992b01a3 torvalds#10 [ffffb9e4f2907d38] __ethtool_get_link_ksettings at ffffffff992b04e4 torvalds#11 [ffffb9e4f2907d90] duplex_show at ffffffff99260300 torvalds#12 [ffffb9e4f2907e38] dev_attr_show at ffffffff9905a01c torvalds#13 [ffffb9e4f2907e50] sysfs_kf_seq_show at ffffffff98e0145b torvalds#14 [ffffb9e4f2907e68] seq_read at ffffffff98d902e3 torvalds#15 [ffffb9e4f2907ec8] vfs_read at ffffffff98d657d1 torvalds#16 [ffffb9e4f2907f00] ksys_read at ffffffff98d65c3f torvalds#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]>
1 parent 31a9729 commit a699781

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
@@ -235,7 +235,7 @@ static ssize_t speed_show(struct device *dev,
235235
if (!rtnl_trylock())
236236
return restart_syscall();
237237

238-
if (netif_running(netdev) && netif_device_present(netdev)) {
238+
if (netif_running(netdev)) {
239239
struct ethtool_link_ksettings cmd;
240240

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

net/ethtool/ioctl.c

+3
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,9 @@ int __ethtool_get_link_ksettings(struct net_device *dev,
442442
if (!dev->ethtool_ops->get_link_ksettings)
443443
return -EOPNOTSUPP;
444444

445+
if (!netif_device_present(dev))
446+
return -ENODEV;
447+
445448
memset(link_ksettings, 0, sizeof(*link_ksettings));
446449
return dev->ethtool_ops->get_link_ksettings(dev, link_ksettings);
447450
}

0 commit comments

Comments
 (0)