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

Previous thread: [2.6 patch] USB iowarrior.c: fix check-after-use by Adrian Bunk on Thursday, October 18, 2007 - 3:52 am. (2 messages)

Next thread: none
From: Adrian Bunk
Date: Thursday, October 18, 2007 - 3:53 am

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 <bunk@kernel.org>

---

 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;
 	}

-

From: Oliver Neukum
Date: Thursday, October 18, 2007 - 4:01 am

Looking good.

	Regards
		Oliver
-

Previous thread: [2.6 patch] USB iowarrior.c: fix check-after-use by Adrian Bunk on Thursday, October 18, 2007 - 3:52 am. (2 messages)

Next thread: none