Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93a2001b authored by Scott Bauer's avatar Scott Bauer Committed by Jiri Kosina
Browse files

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.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarScott Bauer <sbauer@plzdonthack.me>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a80e803a

drivers/hid/usbhid/hiddev.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -516,12 +516,12 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd, 
					goto inval;

					goto inval;

			} else if (uref->usage_index >= field->report_count)

			} else if (uref->usage_index >= field->report_count)

				goto inval;

				goto inval;

		}





			else if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&

		if ((cmd == HIDIOCGUSAGES || cmd == HIDIOCSUSAGES) &&

		    (uref_multi->num_values > HID_MAX_MULTI_USAGES ||

		    (uref_multi->num_values > HID_MAX_MULTI_USAGES ||

		     uref->usage_index + uref_multi->num_values > field->report_count))

		     uref->usage_index + uref_multi->num_values > field->report_count))

			goto inval;

			goto inval;

		}





		switch (cmd) {

		switch (cmd) {

		case HIDIOCGUSAGE:

		case HIDIOCGUSAGE: