diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2008-04-20 19:32:34 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-25 02:08:09 -0400 |
| commit | 6131a2601f42cd7fdbac0e960713396fe68af59f (patch) | |
| tree | d3f518e4f7af61164db2397bd86558b01cff5b70 | |
| parent | 5a0e2cd51145748c4fd44d0c3a06d39eb87e8725 (diff) | |
| download | op-kernel-dev-6131a2601f42cd7fdbac0e960713396fe68af59f.zip op-kernel-dev-6131a2601f42cd7fdbac0e960713396fe68af59f.tar.gz | |
tehuti: check register size
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| -rw-r--r-- | drivers/net/tehuti.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 17585e5..d2e1b219 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c @@ -625,6 +625,12 @@ static void __init bdx_firmware_endianess(void) s_firmLoad[i] = CPU_CHIP_SWAP32(s_firmLoad[i]); } +static int bdx_range_check(struct bdx_priv *priv, u32 offset) +{ + return (offset > (u32) (BDX_REGS_SIZE / priv->nic->port_num)) ? + -EINVAL : 0; +} + static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) { struct bdx_priv *priv = ndev->priv; @@ -646,6 +652,9 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) switch (data[0]) { case BDX_OP_READ: + error = bdx_range_check(priv, data[1]); + if (error < 0) + return error; data[2] = READ_REG(priv, data[1]); DBG("read_reg(0x%x)=0x%x (dec %d)\n", data[1], data[2], data[2]); @@ -655,6 +664,11 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) break; case BDX_OP_WRITE: + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + error = bdx_range_check(priv, data[1]); + if (error < 0) + return error; WRITE_REG(priv, data[1], data[2]); DBG("write_reg(0x%x, 0x%x)\n", data[1], data[2]); break; |
