diff options
| author | Bruno Prémont <bonbons@linux-vserver.org> | 2012-08-19 19:31:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-09-05 11:48:06 +0200 |
| commit | a5785cc0101928663c8ed89f42afea719aecee09 (patch) | |
| tree | 1296b2bb67118a39f4ca203ce64385cfe9eba257 /drivers/hid/hid-picolcd_core.c | |
| parent | 9277738ddde993b01d4119f61b9e5cbdf8d47ab3 (diff) | |
| download | linux-a5785cc0101928663c8ed89f42afea719aecee09.tar.bz2 | |
HID: picoLCD: prevent NULL pointer dereferences
Driver code expects to get access to struct picolcd_data from hiddev
and is not prepared to find a NULL pointer there. Most prominent
candidate to trip on it is picolcd_fb_deferred_io().
Delay removing struct picolcd_data from hiddev until all sub-devices
have been unregistered.
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-picolcd_core.c')
| -rw-r--r-- | drivers/hid/hid-picolcd_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c index 2d7ef688d66e..e4fe342e7aae 100644 --- a/drivers/hid/hid-picolcd_core.c +++ b/drivers/hid/hid-picolcd_core.c @@ -653,7 +653,6 @@ static void picolcd_remove(struct hid_device *hdev) device_remove_file(&hdev->dev, &dev_attr_operation_mode_delay); hid_hw_close(hdev); hid_hw_stop(hdev); - hid_set_drvdata(hdev, NULL); /* Shortcut potential pending reply that will never arrive */ spin_lock_irqsave(&data->lock, flags); @@ -671,6 +670,7 @@ static void picolcd_remove(struct hid_device *hdev) picolcd_exit_cir(data); picolcd_exit_keys(data); + hid_set_drvdata(hdev, NULL); mutex_destroy(&data->mutex); /* Finally, clean up the picolcd data itself */ kfree(data); |