Skip to content

Commit

Permalink
HID: drivers/hid/hid-roccat.c: eliminate a null pointer dereference
Browse files Browse the repository at this point in the history
It is not possible to take the lock in device if device is NULL.
The mutex_lock is thus moved after the NULL test.  New error handling
labels are added at the end to differentiate between the cases where
different sets of locks should be unlocks, and between whether or not
reader should be freed (only on error).

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r@
expression E, E1;
identifier f;
statement S1,S2,S3;
@@

if (E == NULL)
{
  ... when != if (E == NULL || ...) S1 else S2
      when != E = E1
*E->f
  ... when any
  return ...;
}
else S3
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Julia Lawall authored and Jiri Kosina committed Nov 1, 2011
1 parent ad734bc commit 8052ee5
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/hid/hid-roccat.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,27 +162,27 @@ static int roccat_open(struct inode *inode, struct file *file)

device = devices[minor];

mutex_lock(&device->readers_lock);

if (!device) {
pr_emerg("roccat device with minor %d doesn't exist\n", minor);
error = -ENODEV;
goto exit_err;
goto exit_err_devices;
}

mutex_lock(&device->readers_lock);

if (!device->open++) {
/* power on device on adding first reader */
error = hid_hw_power(device->hid, PM_HINT_FULLON);
if (error < 0) {
--device->open;
goto exit_err;
goto exit_err_readers;
}

error = hid_hw_open(device->hid);
if (error < 0) {
hid_hw_power(device->hid, PM_HINT_NORMAL);
--device->open;
goto exit_err;
goto exit_err_readers;
}
}

Expand All @@ -193,13 +193,13 @@ static int roccat_open(struct inode *inode, struct file *file)
list_add_tail(&reader->node, &device->readers);
file->private_data = reader;

exit_unlock:
exit_err_readers:
mutex_unlock(&device->readers_lock);
exit_err_devices:
mutex_unlock(&devices_lock);
if (error)
kfree(reader);
return error;
exit_err:
kfree(reader);
goto exit_unlock;
}

static int roccat_release(struct inode *inode, struct file *file)
Expand Down

0 comments on commit 8052ee5

Please sign in to comment.