diff mbox series

[v2] HID: magicmouse: fix crash when disconnecting Magic Trackpad 2

Message ID 20210510062237.319457-1-jose.exposito89@gmail.com
State Accepted
Commit 4fb125192563670e820991de48f8db495ecc7ff7
Headers show
Series [v2] HID: magicmouse: fix crash when disconnecting Magic Trackpad 2 | expand

Commit Message

José Expósito May 10, 2021, 6:22 a.m. UTC
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>
---
 drivers/hid/hid-magicmouse.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Jiri Kosina May 26, 2021, 10:44 a.m. UTC | #1
On Mon, 10 May 2021, José Expósito wrote:

> 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.


Applied, thank you.

-- 
Jiri Kosina
SUSE Labs
diff mbox series

Patch

diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
index 2bb473d8c424..097870e43cfe 100644
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
@@ -779,7 +779,10 @@  static int magicmouse_probe(struct hid_device *hdev,
 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);
 }