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

Commit 3bbf6e79 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

HID: fix error message in hid_open_report() 



commit b3a81c777dcb093020680490ab970d85e2f6f04f upstream.

On HID report descriptor parsing error the code displays bogus
pointer instead of error offset (subtracts start=NULL from end).
Make the message more useful by displaying correct error offset
and include total buffer size for reference.

This was carried over from ancient times - "Fixed" commit just
promoted the message from DEBUG to ERROR.

Cc: stable@vger.kernel.org
Fixes: 8c3d52fc ("HID: make parser more verbose about parsing errors by default")
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b5e3ad5

drivers/hid/hid-core.c

+5 −2
Original line number Diff line number Diff line
@@ -959,6 +959,7 @@ int hid_open_report(struct hid_device *device) 
	__u8 *start;

	__u8 *buf;

	__u8 *end;

	__u8 *next;

	int ret;

	static int (*dispatch_type[])(struct hid_parser *parser,

				      struct hid_item *item) = {
@@ -1012,7 +1013,8 @@ int hid_open_report(struct hid_device *device) 
	device->collection_size = HID_DEFAULT_NUM_COLLECTIONS;



	ret = -EINVAL;

	while ((start = fetch_item(start, end, &item)) != NULL) {

	while ((next = fetch_item(start, end, &item)) != NULL) {

		start = next;



		if (item.format != HID_ITEM_FORMAT_SHORT) {

			hid_err(device, "unexpected long global item\n");
@@ -1041,7 +1043,8 @@ int hid_open_report(struct hid_device *device) 
		}

	}



	hid_err(device, "item fetching failed at offset %d\n", (int)(end - start));

	hid_err(device, "item fetching failed at offset %u/%u\n",

		size - (unsigned int)(end - start), size);

err:

	vfree(parser);

	hid_close_report(device);