Skip to content

Commit

Permalink
HID: hidraw: fix window in hidraw_release
Browse files Browse the repository at this point in the history
There is a window between hidraw_table check and its dereference.
In that window, the device may be unplugged and removed form the
system and we will then dereference NULL.

Lock that place properly so that either we get NULL and jump out or we
can work with real pointer.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Jiri Slaby authored and Jiri Kosina committed Oct 20, 2010
1 parent a850ea3 commit cb17468
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/hid/hidraw.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,13 @@ static int hidraw_release(struct inode * inode, struct file * file)
unsigned int minor = iminor(inode);
struct hidraw *dev;
struct hidraw_list *list = file->private_data;
int ret;

if (!hidraw_table[minor])
return -ENODEV;
mutex_lock(&minors_lock);
if (!hidraw_table[minor]) {
ret = -ENODEV;
goto unlock;
}

list_del(&list->node);
dev = hidraw_table[minor];
Expand All @@ -227,10 +231,12 @@ static int hidraw_release(struct inode * inode, struct file * file)
kfree(list->hidraw);
}
}

kfree(list);
ret = 0;
unlock:
mutex_unlock(&minors_lock);

return 0;
return ret;
}

static long hidraw_ioctl(struct file *file, unsigned int cmd,
Expand Down

0 comments on commit cb17468

Please sign in to comment.