ethtool: Return immediately on error in ethtool_copy_validate_indir()

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>

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index aa8978ac47d28b8588ff78e02e9607b1d616d6d1..c834cb29f68216aa701f3d1c9e7bf764ec22946b 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -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,