lkml.org 
[lkml]   [2008]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 75/80] applicom: Fix an unchecked user ioctl range and an error return
    Date
    From: Alan Cox <alan@redhat.com>

    Closes bug #11408 by checking the card index range for command 0
    Fixes the ioctl to return ENOTTY which is correct for unknown ioctls

    Signed-off-by: Alan Cox <alan@redhat.com>
    ---

    drivers/char/applicom.c | 6 ++----
    1 files changed, 2 insertions(+), 4 deletions(-)


    diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
    index 31d08b6..b899d91 100644
    --- a/drivers/char/applicom.c
    +++ b/drivers/char/applicom.c
    @@ -712,8 +712,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un

    IndexCard = adgl->num_card-1;

    - if(cmd != 0 && cmd != 6 &&
    - ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) {
    + if(cmd != 6 && ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) {
    static int warncount = 10;
    if (warncount) {
    printk( KERN_WARNING "APPLICOM driver IOCTL, bad board number %d\n",(int)IndexCard+1);
    @@ -832,8 +831,7 @@ static int ac_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
    }
    break;
    default:
    - printk(KERN_INFO "APPLICOM driver ioctl, unknown function code %d\n",cmd) ;
    - ret = -EINVAL;
    + ret = -ENOTTY;
    break;
    }
    Dummy = readb(apbs[IndexCard].RamIO + VERS);


    \
     
     \ /
      Last update: 2008-10-13 12:07    [W:0.022 / U:0.156 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site