Skip to content

Commit

Permalink
HID: magicmouse: Fix an error handling path in magicmouse_probe()
Browse files Browse the repository at this point in the history
If the timer introduced by the commit below is started, then it must be
deleted in the error handling of the probe. Otherwise it would trigger
once the driver is no more.

Fixes: 0b91b4e ("HID: magicmouse: Report battery level over USB")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Tested-by: José Expósito <jose.exposito89@gmail.com>
Reported-by: <syzbot+a437546ec71b04dfb5ac@syzkaller.appspotmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Christophe JAILLET authored and Jiri Kosina committed Jan 6, 2022
1 parent 0b91b4e commit 33812fc
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/hid/hid-magicmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,7 @@ static int magicmouse_probe(struct hid_device *hdev,

return 0;
err_stop_hw:
del_timer_sync(&msc->battery_timer);
hid_hw_stop(hdev);
return ret;
}
Expand Down

0 comments on commit 33812fc

Please sign in to comment.