summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2014-10-30 20:50:15 -0700
committerDavid S. Miller <davem@davemloft.net>2014-10-31 16:12:34 -0400
commite0fb6fb6d52686134b2ece144060219591d4f8d3 (patch)
treeb7adfd022440c708a7654a47c9cb60e9f9e7dfbf /net
parent1e19e084eae727654052339757ab7f1eaff58bad (diff)
downloadlinux-e0fb6fb6d52686134b2ece144060219591d4f8d3.tar.gz
linux-e0fb6fb6d52686134b2ece144060219591d4f8d3.tar.bz2
linux-e0fb6fb6d52686134b2ece144060219591d4f8d3.zip
net: ethtool: Return -EOPNOTSUPP if user space tries to read EEPROM with lengh 0
If a driver supports reading EEPROM but no EEPROM is installed in the system, the driver's get_eeprom_len function returns 0. ethtool will subsequently try to read that zero-length EEPROM anyway. If the driver does not support EEPROM access at all, this operation will return -EOPNOTSUPP. If the driver does support EEPROM access but no EEPROM is installed, the operation will return -EINVAL. Return -EOPNOTSUPP in both cases for consistency. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/ethtool.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 1600aa24d36b..06dfb293e5aa 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1036,7 +1036,8 @@ static int ethtool_get_eeprom(struct net_device *dev, void __user *useraddr)
{
const struct ethtool_ops *ops = dev->ethtool_ops;
- if (!ops->get_eeprom || !ops->get_eeprom_len)
+ if (!ops->get_eeprom || !ops->get_eeprom_len ||
+ !ops->get_eeprom_len(dev))
return -EOPNOTSUPP;
return ethtool_get_any_eeprom(dev, useraddr, ops->get_eeprom,
@@ -1052,7 +1053,8 @@ static int ethtool_set_eeprom(struct net_device *dev, void __user *useraddr)
u8 *data;
int ret = 0;
- if (!ops->set_eeprom || !ops->get_eeprom_len)
+ if (!ops->set_eeprom || !ops->get_eeprom_len ||
+ !ops->get_eeprom_len(dev))
return -EOPNOTSUPP;
if (copy_from_user(&eeprom, useraddr, sizeof(eeprom)))