lkml.org 
[lkml]   [2008]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[26/37] tehuti: check register size (CVE-2008-1675)
    2.6.25-stable review patch.  If anyone has any objections, please let us
    know.

    ------------------
    From: Francois Romieu <romieu@fr.zoreil.com>
    commit 6131a2601f42cd7fdbac0e960713396fe68af59f upstream


    Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/tehuti.c | 14 ++++++++++++++
    1 file changed, 14 insertions(+)
    --- a/drivers/net/tehuti.c
    +++ b/drivers/net/tehuti.c
    @@ -625,6 +625,12 @@ static void __init bdx_firmware_endianes
    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_dev
    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_dev
    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;
    --


    \
     
     \ /
      Last update: 2008-04-29 19:33    [from the cache]
    ©2003-2011 Jasper Spaans