Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1429923
| From | Scott Bauer <sbauer@plzdonthack.me> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands. |
| Date | 2016-06-23 17:30 +0200 |
| Message-ID | <rNeJP-3uS-13@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
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.
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
---
drivers/hid/usbhid/hiddev.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 2f1ddca..700145b 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];
--
1.9.1
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands. Scott Bauer <sbauer@plzdonthack.me> - 2016-06-23 17:30 +0200 Re: [PATCH] Validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands. Jiri Kosina <jikos@kernel.org> - 2016-06-24 10:30 +0200
csiph-web