diff options
| author | Peilin Ye <yepeilin.cs@gmail.com> | 2020-07-29 07:37:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-03 11:29:51 +0200 |
| commit | 7947e0ba4ccaf4ee364c52d32014d4c782a0a67c (patch) | |
| tree | d0b0d48ca09089a62dbe5b224c07d90a79527e82 | |
| parent | 9d960a74b43aaa127608ee5927218aaeadca7d61 (diff) | |
| download | linux-stable-7947e0ba4ccaf4ee364c52d32014d4c782a0a67c.tar.gz linux-stable-7947e0ba4ccaf4ee364c52d32014d4c782a0a67c.tar.bz2 linux-stable-7947e0ba4ccaf4ee364c52d32014d4c782a0a67c.zip | |
HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
commit 25a097f5204675550afb879ee18238ca917cba7a upstream.
`uref->usage_index` is not always being properly checked, causing
hiddev_ioctl_usage() to go out of bounds under some cases. Fix it.
Reported-by: syzbot+34ee1b45d88571c2fa8b@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?id=f2aebe90b8c56806b050a20b36f51ed6acabe802
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 4140dea693e9..4f97e6c12059 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -519,12 +519,16 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd, switch (cmd) { case HIDIOCGUSAGE: + if (uref->usage_index >= field->report_count) + goto inval; uref->value = field->value[uref->usage_index]; if (copy_to_user(user_arg, uref, sizeof(*uref))) goto fault; goto goodreturn; case HIDIOCSUSAGE: + if (uref->usage_index >= field->report_count) + goto inval; field->value[uref->usage_index] = uref->value; goto goodreturn; |