netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations
Subsystems (3)
PATCH 2/3 netdev: Remove redundant checks for CAP_NET_ADMIN in MDIO implementations
dev_ioctl() already checks capable(CAP_NET_ADMIN) before calling the driver's implementation of MDIO ioctls.
Signed-off-by Ben Hutchings <[email protected]>
---
Quoted 2 lines · I wrote:
Currently most drivers[1] that support the "MII" ioctls allow all users to read MDIO registers, while MDIO writes require
CAP_NET_ADMIN.
Thankfully this was not true, so I can remove code instead of adding it.
Ben.
drivers/net/amd8111e.c | 3 --- drivers/net/atl1c/atl1c_main.c | 8 -------- drivers/net/atl1e/atl1e_main.c | 8 -------- drivers/net/atlx/atl2.c | 4 ---- drivers/net/bnx2.c | 3 --- drivers/net/cassini.c | 4 ---- drivers/net/e1000/e1000_main.c | 4 ---- drivers/net/e1000e/netdev.c | 2 -- drivers/net/ibm_newemac/core.c | 2 -- drivers/net/igb/igb_main.c | 2 -- drivers/net/mdio.c | 3 --- drivers/net/mii.c | 3 --- drivers/net/natsemi.c | 2 -- drivers/net/pci-skeleton.c | 5 ----- drivers/net/pcmcia/3c574_cs.c | 2 -- drivers/net/pcmcia/axnet_cs.c | 2 -- drivers/net/pcmcia/pcnet_cs.c | 2 -- drivers/net/pcmcia/xirc2ps_cs.c | 2 -- drivers/net/phy/phy.c | 3 --- drivers/net/r8169.c | 2 -- drivers/net/sis900.c | 2 -- drivers/net/skge.c | 3 --- drivers/net/sky2.c | 3 --- drivers/net/sungem.c | 4 +--- drivers/net/tg3.c | 3 --- drivers/net/tlan.c | 2 -- drivers/net/tulip/tulip_core.c | 2 -- drivers/net/tulip/winbond-840.c | 2 -- drivers/net/via-velocity.c | 4 ---- drivers/net/yellowfin.c | 2 -- 30 files changed, 1 insertions(+), 92 deletions(-)
drivers/net/amd8111e.c +0 -3
@@ -1524,9 +1524,6 @@ static int amd8111e_ioctl(struct net_device * dev , struct ifreq *ifr, int cmd)int err;u32 mii_regval; -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -switch (cmd) {case SIOCGMIIPHY : data->phy_id = lp->ext_phy_addr;
drivers/net/atl1c/atl1c_main.c +0 -8
@@ -534,10 +534,6 @@ static int atl1c_mii_ioctl(struct net_device *netdev,break ;case SIOCGMIIREG : -if (!capable (CAP_NET_ADMIN )) { - retval = -EPERM ; - goto out; - }if (atl1c_read_phy_reg (&adapter->hw, data->reg_num &0x1F , &data->val_out)) { retval = -EIO ;
@@ -546,10 +542,6 @@ static int atl1c_mii_ioctl(struct net_device *netdev,break ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) { - retval = -EPERM ; - goto out; - }if (data->reg_num & ~(0x1F )) { retval = -EFAULT ; goto out;
drivers/net/atl1e/atl1e_main.c +0 -8
@@ -453,10 +453,6 @@ static int atl1e_mii_ioctl(struct net_device *netdev,break ;case SIOCGMIIREG : -if (!capable (CAP_NET_ADMIN )) { - retval = -EPERM ; - goto out; - }if (atl1e_read_phy_reg (&adapter->hw, data->reg_num &0x1F , &data->val_out)) { retval = -EIO ;
@@ -465,10 +461,6 @@ static int atl1e_mii_ioctl(struct net_device *netdev,break ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) { - retval = -EPERM ; - goto out; - }if (data->reg_num & ~(0x1F )) { retval = -EFAULT ; goto out;
drivers/net/atlx/atl2.c +0 -4
@@ -966,8 +966,6 @@ static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) data->phy_id =0 ;break ;case SIOCGMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;spin_lock_irqsave (&adapter->stats_lock, flags);if (atl2_read_phy_reg (&adapter->hw, data->reg_num &0x1F , &data->val_out)) {
@@ -977,8 +975,6 @@ static int atl2_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)spin_unlock_irqrestore (&adapter->stats_lock, flags);break ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;if (data->reg_num & ~(0x1F ))return -EFAULT ;spin_lock_irqsave (&adapter->stats_lock, flags);
drivers/net/bnx2.c +0 -3
@@ -7480,9 +7480,6 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) }case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -if (bp->phy_flags &BNX2_PHY_FLAG_REMOTE_PHY_CAP )return -EOPNOTSUPP ;
drivers/net/cassini.c +0 -4
@@ -4875,10 +4875,6 @@ static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)break ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) { - rc = -EPERM ; -break ; - }spin_lock_irqsave (&cp->lock, flags);cas_mif_poll (cp,0 ); rc =cas_phy_write (cp, data->reg_num &0x1f , data->val_in);
drivers/net/e1000/e1000_main.c +0 -4
@@ -4714,8 +4714,6 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, data->phy_id = hw->phy_addr;break ;case SIOCGMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;spin_lock_irqsave (&adapter->stats_lock, flags);if (e1000_read_phy_reg (hw, data->reg_num &0x1F , &data->val_out)) {
@@ -4725,8 +4723,6 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,spin_unlock_irqrestore (&adapter->stats_lock, flags);break ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;if (data->reg_num & ~(0x1F ))return -EFAULT ; mii_reg = data->val_in;
drivers/net/e1000e/netdev.c +0 -2
@@ -4346,8 +4346,6 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, data->phy_id = adapter->hw.phy.addr;break ;case SIOCGMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;switch (data->reg_num &0x1F ) {case MII_BMCR : data->val_out = adapter->phy_regs.bmcr;
drivers/net/ibm_newemac/core.c +0 -2
@@ -2225,8 +2225,6 @@ static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)return 0 ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;emac_mdio_write (ndev, dev->phy.address, data[1 ], data[2 ]);return 0 ;default :
drivers/net/igb/igb_main.c +0 -2
@@ -4849,8 +4849,6 @@ static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) data->phy_id = adapter->hw.phy.addr;break ;case SIOCGMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;if (igb_read_phy_reg (&adapter->hw, data->reg_num &0x1F , &data->val_out))return -EIO ;
drivers/net/mdio.c +0 -3
@@ -380,10 +380,7 @@ int mdio_mii_ioctl(const struct mdio_if_info *mdio, cmd =SIOCGMIIREG ;break ;case SIOCGMIIREG : -break ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;break ;default :return -EOPNOTSUPP ;
drivers/net/mii.c +0 -3
@@ -433,9 +433,6 @@ int generic_mii_ioctl(struct mii_if_info *mii_if,case SIOCSMIIREG : {u16 val = mii_data->val_in; -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -if (mii_data->phy_id == mii_if->phy_id) {switch (mii_data->reg_num) {case MII_BMCR : {
drivers/net/natsemi.c +0 -2
@@ -3075,8 +3075,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)return 0 ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;if (dev->if_port ==PORT_TP ) {if ((data->phy_id &0x1f ) == np->phy_addr_external) {if ((data->reg_num &0x1f ) ==MII_ADVERTISE )
drivers/net/pci-skeleton.c +0 -5
@@ -1784,11 +1784,6 @@ static int netdrv_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)break ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) { - rc = -EPERM ; -break ; - } -spin_lock_irqsave (&tp->lock, flags);mdio_write (dev, data->phy_id &0x1f , data->reg_num &0x1f , data->val_in);spin_unlock_irqrestore (&tp->lock, flags);
drivers/net/pcmcia/3c574_cs.c +0 -2
@@ -1124,8 +1124,6 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)int saved_window;unsigned long flags; -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;spin_lock_irqsave (&lp->window_lock, flags); saved_window =inw (ioaddr +EL3_CMD ) >>13 ;EL3WINDOW (4 );
drivers/net/pcmcia/axnet_cs.c +0 -2
@@ -706,8 +706,6 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) data[3 ] =mdio_read (mii_addr, data[0 ], data[1 ] &0x1f );return 0 ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;mdio_write (mii_addr, data[0 ], data[1 ] &0x1f , data[2 ]);return 0 ; }
drivers/net/pcmcia/pcnet_cs.c +0 -2
@@ -1204,8 +1204,6 @@ static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) data[3 ] =mdio_read (mii_addr, data[0 ], data[1 ] &0x1f );return 0 ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;mdio_write (mii_addr, data[0 ], data[1 ] &0x1f , data[2 ]);return 0 ; }
drivers/net/pcmcia/xirc2ps_cs.c +0 -2
@@ -1575,8 +1575,6 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) data[3 ] =mii_rd (ioaddr, data[0 ] &0x1f , data[1 ] &0x1f );break ;case SIOCSMIIREG :/* Write the specified MII register */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;mii_wr (ioaddr, data[0 ] &0x1f , data[1 ] &0x1f , data[2 ],16 );break ;default :
drivers/net/phy/phy.c +0 -3
@@ -324,9 +324,6 @@ int phy_mii_ioctl(struct phy_device *phydev,break ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -if (mii_data->phy_id == phydev->addr) {switch (mii_data->reg_num) {case MII_BMCR :
drivers/net/r8169.c +0 -2
@@ -1991,8 +1991,6 @@ static int rtl_xmii_ioctl(struct rtl8169_private *tp, struct mii_ioctl_data *datreturn 0 ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;mdio_write (tp->mmio_addr, data->reg_num &0x1f , data->val_in);return 0 ; }
drivers/net/sis900.c +0 -2
@@ -2128,8 +2128,6 @@ static int mii_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd)return 0 ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;mdio_write (net_dev, data->phy_id &0x1f , data->reg_num &0x1f , data->val_in);return 0 ;default :
drivers/net/skge.c +0 -3
@@ -2496,9 +2496,6 @@ static int skge_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) }case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -spin_lock_bh (&hw->phy_lock);if (hw->chip_id ==CHIP_ID_GENESIS ) err = xm_phy_write(hw, skge->port, data->reg_num & 0x1f,
drivers/net/sky2.c +0 -3
@@ -1213,9 +1213,6 @@ static int sky2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) }case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -spin_lock_bh (&sky2->phy_lock); err =gm_phy_write (hw, sky2->port, data->reg_num &0x1f , data->val_in);
drivers/net/sungem.c +1 -3
@@ -2852,9 +2852,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)break ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) - rc = -EPERM ; -else if (!gp->running) +if (!gp->running) rc = -EAGAIN ;else { __phy_write(gp, data->phy_id & 0x1f, data->reg_num & 0x1f,
drivers/net/tg3.c +0 -3
@@ -10610,9 +10610,6 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (tp->tg3_flags2 &TG3_FLG2_PHY_SERDES )break ;/* We have no PHY */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -if (tp->link_config.phy_is_low_power)return -EAGAIN ;
drivers/net/tlan.c +0 -2
@@ -1004,8 +1004,6 @@ static int TLan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;TLan_MiiWriteReg (dev, data->phy_id &0x1f , data->reg_num &0x1f , data->val_in);return 0 ;
drivers/net/tulip/tulip_core.c +0 -2
@@ -923,8 +923,6 @@ static int private_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)return 0 ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;if (regnum & ~0x1f )return -EINVAL ;if (data->phy_id == phy) {
drivers/net/tulip/winbond-840.c +0 -2
@@ -1470,8 +1470,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)return 0 ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;spin_lock_irq (&np->lock);mdio_write (dev, data->phy_id &0x1f , data->reg_num &0x1f , data->val_in);spin_unlock_irq (&np->lock);
drivers/net/via-velocity.c +0 -4
@@ -2328,14 +2328,10 @@ static int velocity_mii_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd miidata->phy_id =readb (®s->MIIADR) &0x1f ;break ;case SIOCGMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;if (velocity_mii_read (vptr->mac_regs, miidata->reg_num &0x1f , &(miidata->val_out)) <0 )return -ETIMEDOUT ;break ;case SIOCSMIIREG : -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;spin_lock_irqsave (&vptr->lock, flags); err =velocity_mii_write (vptr->mac_regs, miidata->reg_num &0x1f , miidata->val_in);spin_unlock_irqrestore (&vptr->lock, flags);
drivers/net/yellowfin.c +0 -2
@@ -1365,8 +1365,6 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)return 0 ;case SIOCSMIIREG :/* Write MII PHY register. */ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ;if (data->phy_id == np->phys[0 ]) {u16 value = data->val_in;switch (data->reg_num) {
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
From: Ben Hutchings <[email protected]>
Date: Thu, 03 Sep 2009 21:39:43 +0100
Quoted 4 lines
dev_ioctl()already checkscapable(CAP_NET_ADMIN)before calling the driver's implementation of MDIO ioctls.Signed-off-by Ben Hutchings <[email protected]>
Man, it wasn't fun validating the cases where you removed the check function-wide for a ->ndo_dev_ioctl() implementation. :-/
Applied...