Skip to content
Snippets Groups Projects
Commit 2c104e50 authored by Scott Bauer's avatar Scott Bauer Committed by Stuart Scott
Browse files

BACKPORT: UPSTREAM: HID: hiddev: validate num_values for HIDIOCGUSAGES, HIDIOCSUSAGES commands


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: default avatarScott Bauer <sbauer@plzdonthack.me>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Bug: 36251182
Change-Id: I135b15c7de26b59923869f637326062bfb7af513
parent 6a469209
Branches
Tags
No related merge requests found
......@@ -516,12 +516,12 @@ 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) &&
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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment