提交 00d521b3 编写于 作者: V Vladimir Oltean 提交者: David S. Miller

net: don't abuse "default" case for unknown ioctl in dev_ifsioc()

The "switch (cmd)" block from dev_ifsioc() gained a bit too much
unnecessary manual handling of "cmd" in the "default" case, starting
with the private ioctls.

Clean that up by using the "ellipsis" gcc extension, adding separate
cases for the rest of the ioctls, and letting the default case only
return -EINVAL.
Signed-off-by: NVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 51aaa682
...@@ -391,36 +391,32 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data, ...@@ -391,36 +391,32 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data,
rtnl_lock(); rtnl_lock();
return err; return err;
case SIOCDEVPRIVATE ... SIOCDEVPRIVATE + 15:
return dev_siocdevprivate(dev, ifr, data, cmd);
case SIOCSHWTSTAMP: case SIOCSHWTSTAMP:
err = net_hwtstamp_validate(ifr); err = net_hwtstamp_validate(ifr);
if (err) if (err)
return err; return err;
fallthrough; fallthrough;
/* case SIOCGHWTSTAMP:
* Unknown or private ioctl case SIOCGMIIPHY:
*/ case SIOCGMIIREG:
default: case SIOCSMIIREG:
if (cmd >= SIOCDEVPRIVATE && return dev_eth_ioctl(dev, ifr, cmd);
cmd <= SIOCDEVPRIVATE + 15)
return dev_siocdevprivate(dev, ifr, data, cmd);
if (cmd == SIOCGMIIPHY || case SIOCBONDENSLAVE:
cmd == SIOCGMIIREG || case SIOCBONDRELEASE:
cmd == SIOCSMIIREG || case SIOCBONDSETHWADDR:
cmd == SIOCSHWTSTAMP || case SIOCBONDSLAVEINFOQUERY:
cmd == SIOCGHWTSTAMP) { case SIOCBONDINFOQUERY:
err = dev_eth_ioctl(dev, ifr, cmd); case SIOCBONDCHANGEACTIVE:
} else if (cmd == SIOCBONDENSLAVE || return dev_siocbond(dev, ifr, cmd);
cmd == SIOCBONDRELEASE ||
cmd == SIOCBONDSETHWADDR ||
cmd == SIOCBONDSLAVEINFOQUERY ||
cmd == SIOCBONDINFOQUERY ||
cmd == SIOCBONDCHANGEACTIVE) {
err = dev_siocbond(dev, ifr, cmd);
} else
err = -EINVAL;
/* Unknown ioctl */
default:
err = -EINVAL;
} }
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册