system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 19:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ethtool: Return immediately on error in ethtool_copy_validate_indir()

Browse source 
We must return -EFAULT immediately rather than continuing into
the loop.

Similarly, we may as well return -EINVAL directly.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
This commit is contained in:
Ben Hutchings 2014-05-15 00:46:45 +01:00
parent eb02a272c9
commit fb95cd8d14
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/core/ethtool.c
View file

@ -561,19 +561,17 @@ static int ethtool_copy_validate_indir(u32 *indir, void __user *useraddr,
struct ethtool_rxnfc *rx_rings,
u32 size)
{
int ret = 0, i;
int i;
if (copy_from_user(indir, useraddr, size * sizeof(indir[0])))
ret = -EFAULT;
return -EFAULT;
/* Validate ring indices */
for (i = 0; i < size; i++) {
if (indir[i] >= rx_rings->data) {
ret = -EINVAL;
break;
}
}
return ret;
for (i = 0; i < size; i++)
if (indir[i] >= rx_rings->data)
return -EINVAL;
return 0;
}
static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,