diff options
| author | Yunsheng Lin <linyunsheng@huawei.com> | 2018-12-26 12:51:46 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-29 06:24:56 +0100 |
| commit | f9fc54d313fab2834f44f516459cdc8ac91d797f (patch) | |
| tree | a4fabcce30c4deaf8ea081be2544de3d5245678c | |
| parent | include/linux/phy/phy.h: fix minor kerneldoc errors (diff) | |
| download | linux-f9fc54d313fab2834f44f516459cdc8ac91d797f.tar.xz linux-f9fc54d313fab2834f44f516459cdc8ac91d797f.zip | |
ethtool: check the return value of get_regs_len
The return type for get_regs_len in struct ethtool_ops is int,
the hns3 driver may return error when failing to get the regs
len by sending cmd to firmware.
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/ethtool.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index d05402868575..158264f7cfaf 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -793,8 +793,13 @@ static noinline_for_stack int ethtool_get_drvinfo(struct net_device *dev, if (rc >= 0) info.n_priv_flags = rc; } - if (ops->get_regs_len) - info.regdump_len = ops->get_regs_len(dev); + if (ops->get_regs_len) { + int ret = ops->get_regs_len(dev); + + if (ret > 0) + info.regdump_len = ret; + } + if (ops->get_eeprom_len) info.eedump_len = ops->get_eeprom_len(dev); @@ -1337,6 +1342,9 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) return -EFAULT; reglen = ops->get_regs_len(dev); + if (reglen <= 0) + return reglen; + if (regs.len > reglen) regs.len = reglen; |