diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-05-02 00:02:57 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-05-02 00:02:57 +0200 |
| commit | e5288eb5ea89bd82d897cb687348bc608278f920 (patch) | |
| tree | bf123fe05a3310667c8f8024f7b459a40cef010e /drivers/hid | |
| parent | HID: fix possible deadlock in usbhid_close() (diff) | |
| download | linux-e5288eb5ea89bd82d897cb687348bc608278f920.tar.xz linux-e5288eb5ea89bd82d897cb687348bc608278f920.zip | |
HID: fix oops in hid_check_keys_pressed()
If the device is not claimed by hid-input (i.e devices driver by userspace
hiddev/hidraw-based drivers, or completely detached from HID
and driver by libusb), we must not check the hid->inptus, as it
is not guaranteed to be initialized, as this is performed only for devices
handled by hid-input.
Reported-by: Guillaume Chazarain <guichaz@gmail.com>
Tested-by: Guillaume Chazarain <guichaz@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index c7075d2b0786..8551693d645f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1825,6 +1825,9 @@ int hid_check_keys_pressed(struct hid_device *hid) struct hid_input *hidinput; int i; + if (!(hid->claimed & HID_CLAIMED_INPUT)) + return 0; + list_for_each_entry(hidinput, &hid->inputs, list) { for (i = 0; i < BITS_TO_LONGS(KEY_MAX); i++) if (hidinput->input->key[i]) |