| From 9f3ccdc3f6ef10084ceb3a47df0961bec6196fd0 Mon Sep 17 00:00:00 2001 |
| From: Pavel Skripkin <paskripkin@gmail.com> |
| Date: Thu, 30 Dec 2021 20:57:46 -0800 |
| Subject: Input: appletouch - initialize work before device registration |
| |
| From: Pavel Skripkin <paskripkin@gmail.com> |
| |
| commit 9f3ccdc3f6ef10084ceb3a47df0961bec6196fd0 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: 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/input/mouse/appletouch.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/input/mouse/appletouch.c |
| +++ b/drivers/input/mouse/appletouch.c |
| @@ -930,6 +930,8 @@ static int atp_probe(struct usb_interfac |
| 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; |
| @@ -937,8 +939,6 @@ static int atp_probe(struct usb_interfac |
| /* save our data pointer in this interface device */ |
| usb_set_intfdata(iface, dev); |
| |
| - INIT_WORK(&dev->work, atp_reinit); |
| - |
| return 0; |
| |
| err_free_buffer: |
