diff mbox

[net-next,1/8] ethtool: Return immediately on error in ethtool_copy_validate_indir()

Message ID 1401760236.14007.180.camel@deadeye.wl.decadent.org.uk
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Ben Hutchings June 3, 2014, 1:50 a.m. UTC 
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>
---
 net/core/ethtool.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index aa8978a..c834cb2 100644
--- 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,