Skip to content

L
linux
Commit 8b2910fd authored by Vojtech Pavlik's avatar Vojtech Pavlik
Browse files
Options

input: Check the range for HIDIOC?USAGES num_values. 

Signed-off-by: default avatarVojtech Pavlik <vojtech@suse.cz>
parent 664bc086
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
drivers/usb/input/hiddev.c
View file @ 8b2910fd
...@@ -633,14 +633,11 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -633,14 +633,11 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
} else if (uref->usage_index >= field->report_count) } else if (uref->usage_index >= field->report_count)
goto inval; goto inval;
else if ((cmd == HIDIOCGUSAGES || else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&
cmd == HIDIOCSUSAGES) && (uref_multi->num_values >= HID_MAX_MULTI_USAGES ||
(uref->usage_index + uref_multi->num_values >= uref->usage_index + uref_multi->num_values >= field->report_count ||
field->report_count || uref->usage_index + uref_multi->num_values < uref->usage_index))
uref->usage_index + uref_multi->num_values <
uref->usage_index))
goto inval; goto inval;
} }
switch (cmd) { switch (cmd) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7