diff options
| author | Scott Bauer <sbauer@plzdonthack.me> | 2016-06-23 08:59:47 -0600 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-12 08:47:07 -0400 |
| commit | 6f562d23f3bb941cba33d9ec048f6cb85bf2cd80 (patch) | |
| tree | 14da5433b9cb2617e2e6a3a3138cb918c818053f /drivers/hid | |
| parent | 1b9dc6680de288cb47e0a3c1587ba69879b3c26f (diff) | |
| download | linux-stable-6f562d23f3bb941cba33d9ec048f6cb85bf2cd80.tar.gz linux-stable-6f562d23f3bb941cba33d9ec048f6cb85bf2cd80.tar.bz2 linux-stable-6f562d23f3bb941cba33d9ec048f6cb85bf2cd80.zip | |
HID: hiddev: validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands
[ Upstream commit 93a2001bdfd5376c3dc2158653034c20392d15c5 ]
This patch validates the num_values parameter from userland during the
HIDIOCGUSAGES and HIDIOCSUSAGES commands. Previously, if the report id was set
to HID_REPORT_ID_UNKNOWN, we would fail to validate the num_values parameter
leading to a heap overflow.
Cc: stable@vger.kernel.org
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/usbhid/hiddev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 2f1ddca6f2e0..700145b15088 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -516,13 +516,13 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd, goto inval; } else if (uref->usage_index >= field->report_count) goto inval; - - else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) && - (uref_multi->num_values > HID_MAX_MULTI_USAGES || - uref->usage_index + uref_multi->num_values > field->report_count)) - goto inval; } + if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) && + (uref_multi->num_values > HID_MAX_MULTI_USAGES || + uref->usage_index + uref_multi->num_values > field->report_count)) + goto inval; + switch (cmd) { case HIDIOCGUSAGE: uref->value = field->value[uref->usage_index]; |