summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-12-09 20:13:24 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-12-11 13:17:36 -0800
commit82e06090473289ce63e23fdeb8737aad59b10645 (patch)
tree1fecb86bad6c640d27735efaa28a301c0908ecbc
parentce6520b0eafad5962ffc21dc47cd7bd3250e9045 (diff)
downloadlinux-stable-82e06090473289ce63e23fdeb8737aad59b10645.tar.gz
linux-stable-82e06090473289ce63e23fdeb8737aad59b10645.tar.bz2
linux-stable-82e06090473289ce63e23fdeb8737aad59b10645.zip
Input: cm109 - do not stomp on control URB
We need to make sure we are not stomping on the control URB that was issued when opening the device when attempting to toggle buzzer. To do that we need to mark it as pending in cm109_open(). Reported-and-tested-by: syzbot+150f793ac5bc18eee150@syzkaller.appspotmail.com Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/misc/cm109.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index e413801f0491..f515fae465c3 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -568,12 +568,15 @@ static int cm109_input_open(struct input_dev *idev)
dev->ctl_data->byte[HID_OR2] = dev->keybit;
dev->ctl_data->byte[HID_OR3] = 0x00;
+ dev->ctl_urb_pending = 1;
error = usb_submit_urb(dev->urb_ctl, GFP_KERNEL);
- if (error)
+ if (error) {
+ dev->ctl_urb_pending = 0;
dev_err(&dev->intf->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n",
__func__, error);
- else
+ } else {
dev->open = 1;
+ }
mutex_unlock(&dev->pm_mutex);