]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Input: appletouch - initialize work before device registration
authorPavel Skripkin <paskripkin@gmail.com>
Fri, 31 Dec 2021 04:57:46 +0000 (20:57 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 31 Dec 2021 05:04:04 +0000 (21:04 -0800)
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: 5a6eb676d3bc ("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>
drivers/input/mouse/appletouch.c

index bfa26651c0be7c8a5c2173e868a111ece3cb80ba..627048bc6a12e0ed3c2e62a36ca52159ca331efc 100644 (file)
@@ -916,6 +916,8 @@ 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;
@@ -923,8 +925,6 @@ static int atp_probe(struct usb_interface *iface,
        /* save our data pointer in this interface device */
        usb_set_intfdata(iface, dev);
 
-       INIT_WORK(&dev->work, atp_reinit);
-
        return 0;
 
  err_free_buffer: