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

Commit 37a6a8d7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

HID: check for valid USB device for many HID drivers 



commit 93020953d0fa7035fd036ad87a47ae2b7aa4ae33 upstream.

Many HID drivers assume that the HID device assigned to them is a USB
device as that was the only way HID devices used to be able to be
created in Linux.  However, with the additional ways that HID devices
can be created for many different bus types, that is no longer true, so
properly check that we have a USB device associated with the HID device
before allowing a driver that makes this assumption to claim it.

Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: Michael Zaidman <michael.zaidman@gmail.com>
Cc: Stefan Achatz <erazor_de@users.sourceforge.net>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: linux-input@vger.kernel.org
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tested-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
[bentiss: amended for thrustmater.c hunk to apply]
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Link: https://lore.kernel.org/r/20211201183503.2373082-3-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cad5c758

drivers/hid/hid-chicony.c

+6 −2
Original line number Diff line number Diff line
@@ -61,8 +61,12 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
static __u8 *ch_switch12_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);

	struct usb_interface *intf;



	if (!hid_is_usb(hdev))

		return rdesc;



	intf = to_usb_interface(hdev->dev.parent);

	if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {

		/* Change usage maximum and logical maximum from 0x7fff to

		 * 0x2fff, so they don't exceed HID_MAX_USAGES */

drivers/hid/hid-corsair.c

+6 −1
Original line number Diff line number Diff line
@@ -553,7 +553,12 @@ static int corsair_probe(struct hid_device *dev, const struct hid_device_id *id) 
	int ret;

	unsigned long quirks = id->driver_data;

	struct corsair_drvdata *drvdata;

	struct usb_interface *usbif = to_usb_interface(dev->dev.parent);

	struct usb_interface *usbif;



	if (!hid_is_usb(dev))

		return -EINVAL;



	usbif = to_usb_interface(dev->dev.parent);



	drvdata = devm_kzalloc(&dev->dev, sizeof(struct corsair_drvdata),

			       GFP_KERNEL);

drivers/hid/hid-elo.c

+3 −0
Original line number Diff line number Diff line
@@ -230,6 +230,9 @@ static int elo_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	struct elo_priv *priv;

	int ret;



	if (!hid_is_usb(hdev))

		return -EINVAL;



	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;

drivers/hid/hid-holtek-kbd.c

+7 −2
Original line number Diff line number Diff line
@@ -143,12 +143,17 @@ static int holtek_kbd_input_event(struct input_dev *dev, unsigned int type, 
static int holtek_kbd_probe(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);

	int ret = hid_parse(hdev);

	struct usb_interface *intf;

	int ret;



	if (!hid_is_usb(hdev))

		return -EINVAL;



	ret = hid_parse(hdev);

	if (!ret)

		ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);



	intf = to_usb_interface(hdev->dev.parent);

	if (!ret && intf->cur_altsetting->desc.bInterfaceNumber == 1) {

		struct hid_input *hidinput;

		list_for_each_entry(hidinput, &hdev->inputs, list) {

drivers/hid/hid-holtek-mouse.c

+9 −0
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ static __u8 *holtek_mouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
	return rdesc;

}



static int holtek_mouse_probe(struct hid_device *hdev,

			      const struct hid_device_id *id)

{

	if (!hid_is_usb(hdev))

		return -EINVAL;

	return 0;

}



static const struct hid_device_id holtek_mouse_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT,

			USB_DEVICE_ID_HOLTEK_ALT_MOUSE_A067) },
@@ -86,6 +94,7 @@ static struct hid_driver holtek_mouse_driver = { 
	.name = "holtek_mouse",

	.id_table = holtek_mouse_devices,

	.report_fixup = holtek_mouse_report_fixup,

	.probe = holtek_mouse_probe,

};



module_hid_driver(holtek_mouse_driver);