Commit 5d329e24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

Pull from Jiri Kosina:
 "Please pull to receive updates for HID layer.  Nikolai's patch is
  rather important and should still go in for 3.3, as it's a regression
  fix for commit b4b583d4."

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-input: allow array fields out of range
  HID: usbhid: Add NOGET quirk for the AIREN Slim+ keyboard
parents a5939eef 883e0e36

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ 
#define USB_VENDOR_ID_AIRCABLE		0x16CA

#define USB_DEVICE_ID_AIRCABLE1		0x1502



#define USB_VENDOR_ID_AIREN		0x1a2c

#define USB_DEVICE_ID_AIREN_SLIMPLUS	0x0002



#define USB_VENDOR_ID_ALCOR		0x058f

#define USB_DEVICE_ID_ALCOR_USBRS232	0x9720

drivers/hid/hid-input.c

+7 −2
Original line number Diff line number Diff line
@@ -986,8 +986,13 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct 
		return;

	}



	/* Ignore out-of-range values as per HID specification, section 5.10 */

	if (value < field->logical_minimum || value > field->logical_maximum) {

	/*

	 * Ignore out-of-range values as per HID specification,

	 * section 5.10 and 6.2.25

	 */

	if ((field->flags & HID_MAIN_ITEM_VARIABLE) &&

	    (value < field->logical_minimum ||

	     value > field->logical_maximum)) {

		dbg_hid("Ignoring out-of-range value %x\n", value);

		return;

	}

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },



	{ USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },

CRA Git | Maintained and supported by SUSTech CRA and CCSE