Commit 15fc1b5c authored Jun 05, 2019 by Benjamin Tissoires

Revert "HID: Increase maximum report size allowed by hid_field_extract()"



This reverts commit 94a9992f.

The commit allows for more than 32 bits in hid_field_extract(),
but the return value is a 32 bits int.
So basically what this commit is doing is just silencing those
legitimate errors.

Revert to a previous situation in the hope that a proper
fix will be impletemented.

Fixes: 94a9992f ("HID: Increase maximum report size allowed by hid_field_extract()")
Cc: stable@vger.kernel.org # v5.1
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

parent abf82e8f

drivers/hid/hid-core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1314,10 +1314,10 @@ static u32 __extract(u8 *report, unsigned offset, int n)
		u32 hid_field_extract(const struct hid_device hid, u8 report,
		unsigned offset, unsigned n)
		{
		if (n > 256) {
		hid_warn(hid, "hid_field_extract() called with n (%d) > 256! (%s)\n",
		if (n > 32) {
		hid_warn(hid, "hid_field_extract() called with n (%d) > 32! (%s)\n",
		n, current->comm);
		n = 256;
		n = 32;
		}

		return __extract(report, offset, n);

Admin message