Skip to contentSkip to conversation

net: atm: clean up a range check

PATCH In review Dan Carpenter 2 participants 2 messages May 3, 2019 – May 5, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: atm: clean up a range check

The code works fine but the problem is that check for negatives is a no-op:

	if (arg < 0)
		i = 0;

The "i" value isn't used. We immediately overwrite it with:

	i = array_index_nospec(arg, MAX_LEC_ITF);

The array_index_nospec() macro returns zero if "arg" is out of bounds so this works, but the dead code is confusing and it doesn't look very intentional.

---
This applies to net, but it's just a clean up.

 net/atm/lec.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
net/atm/lec.c +1 -3
index ad4f829193f0..a0311493b01b 100644
@@ -726,9 +726,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)
 	struct lec_priv *priv;
 
 	if (arg < 0)
-		i = 0;
-	else
-		i = arg;
+		arg = 0;
 	if (arg >= MAX_LEC_ITF)
 		return -EINVAL;
 	i = array_index_nospec(arg, MAX_LEC_ITF);
Signature · 1 line
2.18.0
maintainer
#1 lore raw

From: Dan Carpenter <[email protected]>
Date: Fri, 3 May 2019 15:39:48 +0300

Quoted 10 lines

The code works fine but the problem is that check for negatives is a no-op:

	if (arg < 0)
		i = 0;

The "i" value isn't used. We immediately overwrite it with:

	i = array_index_nospec(arg, MAX_LEC_ITF);
Quoted 7 lines

The array_index_nospec() macro returns zero if "arg" is out of bounds so this works, but the dead code is confusing and it doesn't look very intentional.

---
This applies to net, but it's just a clean up.

I'm applying this to net-next, thanks Dan.