Commit 6e443653 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hid-for-linus-2024081901' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid 

Pull HID fixes from Jiri Kosina:

 - memory corruption fixes for hid-cougar (Camila Alvarez) and
   hid-amd_sfh (Olivier Sobrie)

 - fix for regression in Wacom driver of twist gesture handling (Jason
   Gerecke)

 - two new device IDs for hid-multitouch (Dmitry Savin) and hid-asus
   (Luke D. Jones)

* tag 'hid-for-linus-2024081901' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: wacom: Defer calculation of resolution until resolution_code is known
  HID: multitouch: Add support for GT7868Q
  HID: amd_sfh: free driver_data after destroying hid device
  hid-asus: add ROG Ally X prod ID to quirk list
  HID: cougar: fix slab-out-of-bounds Read in cougar_report_fixup
parents b0da6408 1b8f9c1f

drivers/hid/amd-sfh-hid/amd_sfh_hid.c

+3 −1
Original line number Diff line number Diff line
@@ -171,11 +171,13 @@ int amdtp_hid_probe(u32 cur_hid_dev, struct amdtp_cl_data *cli_data) 
void amdtp_hid_remove(struct amdtp_cl_data *cli_data)

{

	int i;

	struct amdtp_hid_data *hid_data;



	for (i = 0; i < cli_data->num_hid_devices; ++i) {

		if (cli_data->hid_sensor_hubs[i]) {

			kfree(cli_data->hid_sensor_hubs[i]->driver_data);

			hid_data = cli_data->hid_sensor_hubs[i]->driver_data;

			hid_destroy_device(cli_data->hid_sensor_hubs[i]);

			kfree(hid_data);

			cli_data->hid_sensor_hubs[i] = NULL;

		}

	}

drivers/hid/hid-asus.c

+3 −0
Original line number Diff line number Diff line
@@ -1248,6 +1248,9 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),

	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },

drivers/hid/hid-cougar.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void cougar_fix_g6_mapping(void) 
static __u8 *cougar_report_fixup(struct hid_device *hdev, __u8 *rdesc,

				 unsigned int *rsize)

{

	if (rdesc[2] == 0x09 && rdesc[3] == 0x02 &&

	if (*rsize >= 117 && rdesc[2] == 0x09 && rdesc[3] == 0x02 &&

	    (rdesc[115] | rdesc[116] << 8) >= HID_MAX_USAGES) {

		hid_info(hdev,

			"usage count exceeds max: fixing up report descriptor\n");

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3	0x1a30

#define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR		0x18c6

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY		0x1abe

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X		0x1b4c

#define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b

#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869
@@ -520,6 +521,8 @@ 
#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100



#define I2C_VENDOR_ID_GOODIX		0x27c6

#define I2C_DEVICE_ID_GOODIX_01E8	0x01e8

#define I2C_DEVICE_ID_GOODIX_01E9	0x01e9

#define I2C_DEVICE_ID_GOODIX_01F0	0x01f0



#define USB_VENDOR_ID_GOODTOUCH		0x1aad

drivers/hid/hid-multitouch.c

+33 −0
Original line number Diff line number Diff line
@@ -1441,6 +1441,30 @@ static int mt_event(struct hid_device *hid, struct hid_field *field, 
	return 0;

}



static __u8 *mt_report_fixup(struct hid_device *hdev, __u8 *rdesc,

			     unsigned int *size)

{

	if (hdev->vendor == I2C_VENDOR_ID_GOODIX &&

	    (hdev->product == I2C_DEVICE_ID_GOODIX_01E8 ||

	     hdev->product == I2C_DEVICE_ID_GOODIX_01E9)) {

		if (rdesc[607] == 0x15) {

			rdesc[607] = 0x25;

			dev_info(

				&hdev->dev,

				"GT7868Q report descriptor fixup is applied.\n");

		} else {

			dev_info(

				&hdev->dev,

				"The byte is not expected for fixing the report descriptor. \

It's possible that the touchpad firmware is not suitable for applying the fix. \

got: %x\n",

				rdesc[607]);

		}

	}



	return rdesc;

}



static void mt_report(struct hid_device *hid, struct hid_report *report)

{

	struct mt_device *td = hid_get_drvdata(hid);
@@ -2035,6 +2059,14 @@ static const struct hid_device_id mt_devices[] = { 
		MT_BT_DEVICE(USB_VENDOR_ID_FRUCTEL,

			USB_DEVICE_ID_GAMETEL_MT_MODE) },



	/* Goodix GT7868Q devices */

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,

	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,

		     I2C_DEVICE_ID_GOODIX_01E8) },

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,

	  HID_DEVICE(BUS_I2C, HID_GROUP_ANY, I2C_VENDOR_ID_GOODIX,

		     I2C_DEVICE_ID_GOODIX_01E8) },



	/* GoodTouch panels */

	{ .driver_data = MT_CLS_NSMU,

		MT_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,
@@ -2270,6 +2302,7 @@ static struct hid_driver mt_driver = { 
	.feature_mapping = mt_feature_mapping,

	.usage_table = mt_grabbed_usages,

	.event = mt_event,

	.report_fixup = mt_report_fixup,

	.report = mt_report,

	.suspend = pm_ptr(mt_suspend),

	.reset_resume = pm_ptr(mt_reset_resume),