HID: hidraw: fix window in hidraw_release

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>
This commit is contained in:
Jiri Slaby 2010-10-19 11:29:55 +02:00 committed by Jiri Kosina
parent a850ea3037
commit cb174681a9
1 changed files with 10 additions and 4 deletions

View File

@ -212,9 +212,13 @@ static int hidraw_release(struct inode * inode, struct file * file)
unsigned int minor = iminor(inode); unsigned int minor = iminor(inode);
struct hidraw *dev; struct hidraw *dev;
struct hidraw_list *list = file->private_data; struct hidraw_list *list = file->private_data;
int ret;
if (!hidraw_table[minor]) mutex_lock(&minors_lock);
return -ENODEV; if (!hidraw_table[minor]) {
ret = -ENODEV;
goto unlock;
}
list_del(&list->node); list_del(&list->node);
dev = hidraw_table[minor]; dev = hidraw_table[minor];
@ -227,10 +231,12 @@ static int hidraw_release(struct inode * inode, struct file * file)
kfree(list->hidraw); kfree(list->hidraw);
} }
} }
kfree(list); kfree(list);
ret = 0;
unlock:
mutex_unlock(&minors_lock);
return 0; return ret;
} }
static long hidraw_ioctl(struct file *file, unsigned int cmd, static long hidraw_ioctl(struct file *file, unsigned int cmd,