diff options
author | Stefan Achatz <erazor_de@users.sourceforge.net> | 2011-06-12 04:02:44 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-06-13 07:06:23 -0400 |
commit | 901e64dbdb5998b9248c372a401c921bbdf662f6 (patch) | |
tree | 439c7685adb52e2b97b968ee6535da29a8434915 /drivers/hid/hid-roccat-pyra.c | |
parent | 1edd5b42a6631b1b1f147e9018e309bde8d96a05 (diff) |
HID: roccat: fix NULL pointer dereference, add range checks
On rare occassions raw events can be triggered before drvdata gets set up
which leads to NULL pointer dereferences. This was only observed with pyra on
2.6.39, but is fixed for all devices now to play it save.
kovaplus returned wrong actual values when profile change was initiated from host.
Added range checks for setting actual profile on all devices.
Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-roccat-pyra.c')
-rw-r--r-- | drivers/hid/hid-roccat-pyra.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c index 75a092e0d1d8..8140776bd8c5 100644 --- a/drivers/hid/hid-roccat-pyra.c +++ b/drivers/hid/hid-roccat-pyra.c | |||
@@ -637,6 +637,9 @@ static int pyra_raw_event(struct hid_device *hdev, struct hid_report *report, | |||
637 | != USB_INTERFACE_PROTOCOL_MOUSE) | 637 | != USB_INTERFACE_PROTOCOL_MOUSE) |
638 | return 0; | 638 | return 0; |
639 | 639 | ||
640 | if (pyra == NULL) | ||
641 | return 0; | ||
642 | |||
640 | pyra_keep_values_up_to_date(pyra, data); | 643 | pyra_keep_values_up_to_date(pyra, data); |
641 | 644 | ||
642 | if (pyra->roccat_claimed) | 645 | if (pyra->roccat_claimed) |