[2.6 patch] USB rio500.c: fix check-after-use - Kernel

This is a discussion on [2.6 patch] USB rio500.c: fix check-after-use - Kernel ; The Coverity checker spotted that we have already oops'ed if "dev" was NULL in these places. Since "dev" being NULL isn't possible at these places this patch removes the NULL checks. Additionally, I've fixed the formatting of the if's. Signed-off-by: ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [2.6 patch] USB rio500.c: fix check-after-use

  1. [2.6 patch] USB rio500.c: fix check-after-use

    The Coverity checker spotted that we have already oops'ed if "dev"
    was NULL in these places.

    Since "dev" being NULL isn't possible at these places this patch removes
    the NULL checks.

    Additionally, I've fixed the formatting of the if's.

    Signed-off-by: Adrian Bunk

    ---

    drivers/usb/misc/rio500.c | 15 +++------------
    1 file changed, 3 insertions(+), 12 deletions(-)

    19cc945c5387e84123f654e1d7e7c79d29b3516c
    diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
    index 88f6abe..330c18e 100644
    --- a/drivers/usb/misc/rio500.c
    +++ b/drivers/usb/misc/rio500.c
    @@ -118,10 +118,7 @@ ioctl_rio(struct inode *inode, struct file *file, unsigned int cmd,

    mutex_lock(&(rio->lock));
    /* Sanity check to make sure rio is connected, powered, etc */
    - if ( rio == NULL ||
    - rio->present == 0 ||
    - rio->rio_dev == NULL )
    - {
    + if (rio->present == 0 || rio->rio_dev == NULL) {
    retval = -ENODEV;
    goto err_out;
    }
    @@ -280,10 +277,7 @@ write_rio(struct file *file, const char __user *buffer,
    if (intr)
    return -EINTR;
    /* Sanity check to make sure rio is connected, powered, etc */
    - if ( rio == NULL ||
    - rio->present == 0 ||
    - rio->rio_dev == NULL )
    - {
    + if (rio->present == 0 || rio->rio_dev == NULL) {
    mutex_unlock(&(rio->lock));
    return -ENODEV;
    }
    @@ -369,10 +363,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
    if (intr)
    return -EINTR;
    /* Sanity check to make sure rio is connected, powered, etc */
    - if ( rio == NULL ||
    - rio->present == 0 ||
    - rio->rio_dev == NULL )
    - {
    + if (rio->present == 0 || rio->rio_dev == NULL) {
    mutex_unlock(&(rio->lock));
    return -ENODEV;
    }

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [linux-usb-devel] [2.6 patch] USB rio500.c: fix check-after-use

    Am Donnerstag 18 Oktober 2007 schrieb Adrian Bunk:
    > The Coverity checker spotted that we have already oops'ed if "dev"
    > was NULL in these places.
    >
    > Since "dev" being NULL isn't possible at these places this patch removes
    > the NULL checks.


    Looking good.

    Regards
    Oliver
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread