Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5785cc0 authored by Bruno Prémont's avatar Bruno Prémont Committed by Jiri Kosina
Browse files

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: default avatarBruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9277738d

drivers/hid/hid-picolcd_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);