]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
HID: reject input outside logical range only if null state is set
authorValtteri Heikkilä <rnd@nic.fi>
Tue, 14 Feb 2017 23:14:32 +0000 (23:14 +0000)
committerJiri Kosina <jkosina@suse.cz>
Mon, 6 Mar 2017 13:02:37 +0000 (14:02 +0100)
This patch fixes an issue in drivers/hid/hid-input.c where USB HID
control null state flag is not checked upon rejecting inputs outside
logical minimum-maximum range. The check should be made according to USB
HID specification 1.11, section 6.2.2.5, p.31. The fix will resolve
issues with some game controllers, such as:
https://bugzilla.kernel.org/show_bug.cgi?id=68621

[tk@the-tk.com: shortened and fixed spelling in commit message]
Signed-off-by: Valtteri Heikkilä <rnd@nic.fi>
Signed-off-by: Tomasz Kramkowski <tk@the-tk.com>
Acked-By: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-input.c

index d05f903c7614530625d9adc696cdc7f3661abe15..cf8256aac2bd7a0ff7467009c523d5ac433bcc5f 100644 (file)
@@ -1157,6 +1157,7 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
         * don't specify logical min and max.
         */
        if ((field->flags & HID_MAIN_ITEM_VARIABLE) &&
+           (field->flags & HID_MAIN_ITEM_NULL_STATE) &&
            (field->logical_minimum < field->logical_maximum) &&
            (value < field->logical_minimum ||
             value > field->logical_maximum)) {