]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ethtool: check device is present when getting link settings
authorJamie Bainbridge <jamie.bainbridge@gmail.com>
Fri, 23 Aug 2024 06:26:58 +0000 (16:26 +1000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 26 Aug 2024 21:03:02 +0000 (14:03 -0700)
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 4224cfd7fb65
("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: d519e17e2d01 ("net: export device speed and duplex via sysfs")
Fixes: 4224cfd7fb65 ("net-sysfs: add check for netdevice being present to speed_show")
Signed-off-by: Jamie Bainbridge <jamie.bainbridge@gmail.com>
Link: https://patch.msgid.link/8bae218864beaa44ed01628140475b9bf641c5b0.1724393671.git.jamie.bainbridge@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/net-sysfs.c
net/ethtool/ioctl.c

index 0e2084ce7b7572bff458ed7e02358d9258c74628..444f23e74f8e6bed058eee09e03e045d4df6bd52 100644 (file)
@@ -235,7 +235,7 @@ static ssize_t speed_show(struct device *dev,
        if (!rtnl_trylock())
                return restart_syscall();
 
-       if (netif_running(netdev) && netif_device_present(netdev)) {
+       if (netif_running(netdev)) {
                struct ethtool_link_ksettings cmd;
 
                if (!__ethtool_get_link_ksettings(netdev, &cmd))
index e18823bf23306dffd32ddc752458e3c350a29b42..ae041f51cd2da4e6f98a1dc24ff109432dae2946 100644 (file)
@@ -442,6 +442,9 @@ int __ethtool_get_link_ksettings(struct net_device *dev,
        if (!dev->ethtool_ops->get_link_ksettings)
                return -EOPNOTSUPP;
 
+       if (!netif_device_present(dev))
+               return -ENODEV;
+
        memset(link_ksettings, 0, sizeof(*link_ksettings));
        return dev->ethtool_ops->get_link_ksettings(dev, link_ksettings);
 }