]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
HID: magicmouse: fix crash when disconnecting Magic Trackpad 2
authorJosé Expósito <jose.exposito89@gmail.com>
Mon, 10 May 2021 06:22:37 +0000 (08:22 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 27 May 2021 13:40:34 +0000 (15:40 +0200)
When the Apple Magic Trackpad 2 is connected over USB it registers four
hid_device report descriptors, however, the driver only handles the one
with type HID_TYPE_USBMOUSE and ignores the other three, thus, no driver
data is attached to them.

When the device is disconnected, the remove callback is called for the
four hid_device report descriptors, crashing when the driver data is
NULL.

Check that the driver data is not NULL before using it in the remove
callback.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-magicmouse.c

index 2bb473d8c424e0c190b05665e7581fe034b4ff42..097870e43cfe890cd82793a365567383cafde116 100644 (file)
@@ -779,7 +779,10 @@ err_stop_hw:
 static void magicmouse_remove(struct hid_device *hdev)
 {
        struct magicmouse_sc *msc = hid_get_drvdata(hdev);
-       cancel_delayed_work_sync(&msc->work);
+
+       if (msc)
+               cancel_delayed_work_sync(&msc->work);
+
        hid_hw_stop(hdev);
 }