|
@@ -923,7 +923,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
|
|
regs.len = reglen;
|
|
regs.len = reglen;
|
|
|
|
|
|
regbuf = vzalloc(reglen);
|
|
regbuf = vzalloc(reglen);
|
|
- if (!regbuf)
|
|
|
|
|
|
+ if (reglen && !regbuf)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
ops->get_regs(dev, ®s, regbuf);
|
|
ops->get_regs(dev, ®s, regbuf);
|
|
@@ -932,7 +932,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
|
|
if (copy_to_user(useraddr, ®s, sizeof(regs)))
|
|
if (copy_to_user(useraddr, ®s, sizeof(regs)))
|
|
goto out;
|
|
goto out;
|
|
useraddr += offsetof(struct ethtool_regs, data);
|
|
useraddr += offsetof(struct ethtool_regs, data);
|
|
- if (copy_to_user(useraddr, regbuf, regs.len))
|
|
|
|
|
|
+ if (regbuf && copy_to_user(useraddr, regbuf, regs.len))
|
|
goto out;
|
|
goto out;
|
|
ret = 0;
|
|
ret = 0;
|
|
|
|
|