Commit 8dd30201 authored by Tariq Toukan's avatar Tariq Toukan Committed by David S. Miller

net: remove redundant input checks in SIOCSIFTXQLEN case of dev_ifsioc

The cited patch added a call to dev_change_tx_queue_len in
SIOCSIFTXQLEN case.
This obsoletes the new len comparison check done before the function call.
Remove it here.

For the desicion of keep/remove the negative value check, we examine the
range check in dev_change_tx_queue_len.
On 64-bit we will fail with -ERANGE.  The 32-bit int ifr_qlen will be sign
extended to 64-bits when it is passed into dev_change_tx_queue_len(). And
then for negative values this test triggers:

	if (new_len != (unsigned int)new_len)
		return -ERANGE;

because:
	if (0xffffffffWHATEVER != 0x00000000WHATEVER)

On 32-bit the signed value will be accepted, changing behavior.

Therefore, the negative value check is kept.

Fixes: 3f76df19 ("net: use dev_change_tx_queue_len() for SIOCSIFTXQLEN")
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Reviewed-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4ef85da
...@@ -284,12 +284,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) ...@@ -284,12 +284,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)
case SIOCSIFTXQLEN: case SIOCSIFTXQLEN:
if (ifr->ifr_qlen < 0) if (ifr->ifr_qlen < 0)
return -EINVAL; return -EINVAL;
if (dev->tx_queue_len ^ ifr->ifr_qlen) { return dev_change_tx_queue_len(dev, ifr->ifr_qlen);
err = dev_change_tx_queue_len(dev, ifr->ifr_qlen);
if (err)
return err;
}
return 0;
case SIOCSIFNAME: case SIOCSIFNAME:
ifr->ifr_newname[IFNAMSIZ-1] = '\0'; ifr->ifr_newname[IFNAMSIZ-1] = '\0';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment