diff options
| author |   Johan Hovold <johan@kernel.org> | 2021-05-17 12:04:30 +0200 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2021-05-27 15:40:35 +0200 |
| commit | 4b4f6cecca446abcb686c6e6c451d4f1ec1a7497 (patch) | |
| tree | 43e7527141c338325a6c31c2fbfcaa0e8f34e066 /drivers/hid/hid-magicmouse.c | |
| parent | HID: intel-ish-hid: ipc: Add Alder Lake device IDs (diff) | |
| download | linux-dev-4b4f6cecca446abcb686c6e6c451d4f1ec1a7497.tar.xz linux-dev-4b4f6cecca446abcb686c6e6c451d4f1ec1a7497.zip | |
HID: magicmouse: fix NULL-deref on disconnect
Commit 9d7b18668956 ("HID: magicmouse: add support for Apple Magic
Trackpad 2") added a sanity check for an Apple trackpad but returned
success instead of -ENODEV when the check failed. This means that the
remove callback will dereference the never-initialised driver data
pointer when the driver is later unbound (e.g. on USB disconnect).
Reported-by: syzbot+ee6f6e2e68886ca256a8@syzkaller.appspotmail.com
Fixes: 9d7b18668956 ("HID: magicmouse: add support for Apple Magic Trackpad 2")
Cc: stable@vger.kernel.org # 4.20
Cc: Claudio Mettler <claudio@ponyfleisch.ch>
Cc: Marek Wyborski <marek.wyborski@emwesoft.com>
Cc: Sean O'Brien <seobrien@chromium.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-magicmouse.c')
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 097870e43cfe..8bcaee4ccae0 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -693,7 +693,7 @@ static int magicmouse_probe(struct hid_device *hdev, if (id->vendor == USB_VENDOR_ID_APPLE && id->product == USB_DEVICE_ID_APPLE_MAGICTRACKPAD2 && hdev->type != HID_TYPE_USBMOUSE) - return 0; + return -ENODEV; msc = devm_kzalloc(&hdev->dev, sizeof(*msc), GFP_KERNEL); if (msc == NULL) { |