diff options
| author |   Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-02-25 19:34:06 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-26 08:49:05 -0800 |
| commit | 1b45ff6c17f1d07c496b08dd602a4aff8fe40848 (patch) | |
| tree | 8e7cc2289a7e48072dc3db8690e709828debb7d9 /net/core/ethtool.c | |
| parent | nfp: remove ethtool flashing fallback (diff) | |
| download | linux-dev-1b45ff6c17f1d07c496b08dd602a4aff8fe40848.tar.xz linux-dev-1b45ff6c17f1d07c496b08dd602a4aff8fe40848.zip | |
devlink: hold a reference to the netdevice around ethtool compat
When ethtool is calling into devlink compat code make sure we have
a reference on the netdevice on which the operation was invoked.
v3: move the hold/lock logic into devlink_compat_* functions (Florian)
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/ethtool.c')
| -rw-r--r-- | net/core/ethtool.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 1320e8dce559..47558ffae423 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -805,11 +805,9 @@ static noinline_for_stack int ethtool_get_drvinfo(struct net_device *dev, if (ops->get_eeprom_len) info.eedump_len = ops->get_eeprom_len(dev); - rtnl_unlock(); if (!info.fw_version[0]) devlink_compat_running_version(dev, info.fw_version, sizeof(info.fw_version)); - rtnl_lock(); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; @@ -2040,15 +2038,8 @@ static noinline_for_stack int ethtool_flash_device(struct net_device *dev, return -EFAULT; efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0; - if (!dev->ethtool_ops->flash_device) { - int ret; - - rtnl_unlock(); - ret = devlink_compat_flash_update(dev, efl.data); - rtnl_lock(); - - return ret; - } + if (!dev->ethtool_ops->flash_device) + return devlink_compat_flash_update(dev, efl.data); return dev->ethtool_ops->flash_device(dev, &efl); } |