Commit 52cd1906 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

HID: core: save one kmemdup during .probe() 



Turns out the first kmemdup is only required for the .report_fixup()
driver callback. There is no need to do two kmemdup() in a row in case
.report_fixup() is not present.

Reviewed-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Link: https://patch.msgid.link/20241001-hid-bpf-hid-generic-v3-2-2ef1019468df@kernel.org


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent 8b7fd6a1

drivers/hid/hid-core.c

+11 −7
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ int hid_open_report(struct hid_device *device) 
	struct hid_item item;

	unsigned int size;

	const __u8 *start;

	__u8 *buf;

	__u8 *buf = NULL;

	const __u8 *end;

	const __u8 *next;

	int ret;
@@ -1235,14 +1235,18 @@ int hid_open_report(struct hid_device *device) 
		return -ENODEV;

	size = device->bpf_rsize;



	if (device->driver->report_fixup) {

		/*

		 * device->driver->report_fixup() needs to work

		 * on a copy of our report descriptor so it can

		 * change it.

		 */

		buf = kmemdup(start, size, GFP_KERNEL);

		if (buf == NULL)

			return -ENOMEM;



	if (device->driver->report_fixup)

		start = device->driver->report_fixup(device, buf, &size);

	else

		start = buf;

	}



	start = kmemdup(start, size, GFP_KERNEL);

	kfree(buf);