Skip to content

Commit

Permalink
Input: appletouch - initialize work before device registration
Browse files Browse the repository at this point in the history
commit 9f3ccdc upstream.

Syzbot has reported warning in __flush_work(). This warning is caused by
work->func == NULL, which means missing work initialization.

This may happen, since input_dev->close() calls
cancel_work_sync(&dev->work), but dev->work initalization happens _after_
input_register_device() call.

So this patch moves dev->work initialization before registering input
device

Fixes: 5a6eb67 ("Input: appletouch - improve powersaving for Geyser3 devices")
Reported-and-tested-by: syzbot+b88c5eae27386b252bbd@syzkaller.appspotmail.com
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
Link: https://lore.kernel.org/r/20211230141151.17300-1-paskripkin@gmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
pskrgag authored and gregkh committed Jan 5, 2022
1 parent 90ffed2 commit e79ff8c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/mouse/appletouch.c
Expand Up @@ -916,15 +916,15 @@ static int atp_probe(struct usb_interface *iface,
set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
set_bit(BTN_LEFT, input_dev->keybit);

INIT_WORK(&dev->work, atp_reinit);

error = input_register_device(dev->input);
if (error)
goto err_free_buffer;

/* save our data pointer in this interface device */
usb_set_intfdata(iface, dev);

INIT_WORK(&dev->work, atp_reinit);

return 0;

err_free_buffer:
Expand Down

0 comments on commit e79ff8c

Please sign in to comment.