linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] input: cm109: fix URB submitted while active
@ 2021-08-04 14:58 Pavel Skripkin
  2021-08-18 11:07 ` Pavel Skripkin
  0 siblings, 1 reply; 3+ messages in thread
From: Pavel Skripkin @ 2021-08-04 14:58 UTC (permalink / raw)
  To: dmitry.torokhov, aeh
  Cc: linux-input, linux-kernel, Pavel Skripkin, syzbot+2d6d691af5ab4b7e66df

Syzbot reported, that dev->urb_ctl was submitted while active. The
problem was in missing validation check. We should check, that dev->urb_ctl
is not pending before sumbitting it again.

Fail log:

URB 00000000cfeee59c submitted while active
WARNING: CPU: 1 PID: 8459 at drivers/usb/core/urb.c:378 usb_submit_urb+0x1271/0x1540 drivers/usb/core/urb.c:378
...
Call Trace:
 <IRQ>
 cm109_urb_irq_callback+0x44f/0xaa0 drivers/input/misc/cm109.c:422
 __usb_hcd_giveback_urb+0x2b0/0x5c0 drivers/usb/core/hcd.c:1656
 usb_hcd_giveback_urb+0x367/0x410 drivers/usb/core/hcd.c:1726

Reported-and-tested-by: syzbot+2d6d691af5ab4b7e66df@syzkaller.appspotmail.com
Fixes: c04148f915e5 ("Input: add driver for USB VoIP phones with CM109 chipset")
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
---
 drivers/input/misc/cm109.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index f515fae465c3..60bddadbbe3a 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -406,7 +406,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
 
 	dev->irq_urb_pending = 0;
 
-	if (likely(!dev->shutdown)) {
+	if (likely(!dev->shutdown) && likely(!dev->ctl_urb_pending)) {
 
 		if (dev->buzzer_state)
 			dev->ctl_data->byte[HID_OR0] |= BUZZER_ON;
-- 
2.32.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] input: cm109: fix URB submitted while active
  2021-08-04 14:58 [PATCH] input: cm109: fix URB submitted while active Pavel Skripkin
@ 2021-08-18 11:07 ` Pavel Skripkin
  2021-09-19 17:30   ` Pavel Skripkin
  0 siblings, 1 reply; 3+ messages in thread
From: Pavel Skripkin @ 2021-08-18 11:07 UTC (permalink / raw)
  To: dmitry.torokhov, aeh
  Cc: linux-input, linux-kernel, syzbot+2d6d691af5ab4b7e66df

On 8/4/21 5:58 PM, Pavel Skripkin wrote:
> Syzbot reported, that dev->urb_ctl was submitted while active. The
> problem was in missing validation check. We should check, that dev->urb_ctl
> is not pending before sumbitting it again.
> 
> Fail log:
> 
> URB 00000000cfeee59c submitted while active
> WARNING: CPU: 1 PID: 8459 at drivers/usb/core/urb.c:378 usb_submit_urb+0x1271/0x1540 drivers/usb/core/urb.c:378
> ...
> Call Trace:
>   <IRQ>
>   cm109_urb_irq_callback+0x44f/0xaa0 drivers/input/misc/cm109.c:422
>   __usb_hcd_giveback_urb+0x2b0/0x5c0 drivers/usb/core/hcd.c:1656
>   usb_hcd_giveback_urb+0x367/0x410 drivers/usb/core/hcd.c:1726
> 
> Reported-and-tested-by: syzbot+2d6d691af5ab4b7e66df@syzkaller.appspotmail.com
> Fixes: c04148f915e5 ("Input: add driver for USB VoIP phones with CM109 chipset")
> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
> ---


Gentle ping :)



With regards,
Pavel Skripkin

>   drivers/input/misc/cm109.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
> index f515fae465c3..60bddadbbe3a 100644
> --- a/drivers/input/misc/cm109.c
> +++ b/drivers/input/misc/cm109.c
> @@ -406,7 +406,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
>   
>   	dev->irq_urb_pending = 0;
>   
> -	if (likely(!dev->shutdown)) {
> +	if (likely(!dev->shutdown) && likely(!dev->ctl_urb_pending)) {
>   
>   		if (dev->buzzer_state)
>   			dev->ctl_data->byte[HID_OR0] |= BUZZER_ON;
> 



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] input: cm109: fix URB submitted while active
  2021-08-18 11:07 ` Pavel Skripkin
@ 2021-09-19 17:30   ` Pavel Skripkin
  0 siblings, 0 replies; 3+ messages in thread
From: Pavel Skripkin @ 2021-09-19 17:30 UTC (permalink / raw)
  To: dmitry.torokhov, aeh
  Cc: linux-input, linux-kernel, syzbot+2d6d691af5ab4b7e66df

On 8/18/21 14:07, Pavel Skripkin wrote:
> On 8/4/21 5:58 PM, Pavel Skripkin wrote:
>> Syzbot reported, that dev->urb_ctl was submitted while active. The
>> problem was in missing validation check. We should check, that dev->urb_ctl
>> is not pending before sumbitting it again.
>> 
>> Fail log:
>> 
>> URB 00000000cfeee59c submitted while active
>> WARNING: CPU: 1 PID: 8459 at drivers/usb/core/urb.c:378 usb_submit_urb+0x1271/0x1540 drivers/usb/core/urb.c:378
>> ...
>> Call Trace:
>>   <IRQ>
>>   cm109_urb_irq_callback+0x44f/0xaa0 drivers/input/misc/cm109.c:422
>>   __usb_hcd_giveback_urb+0x2b0/0x5c0 drivers/usb/core/hcd.c:1656
>>   usb_hcd_giveback_urb+0x367/0x410 drivers/usb/core/hcd.c:1726
>> 
>> Reported-and-tested-by: syzbot+2d6d691af5ab4b7e66df@syzkaller.appspotmail.com
>> Fixes: c04148f915e5 ("Input: add driver for USB VoIP phones with CM109 chipset")
>> Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
>> ---
> 
> 
> Gentle ping :)
> 
> 

Hi, Dmitry,

did you have a chance to review this one? Thanks :)




With regards,
Pavel Skripkin

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-19 17:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-04 14:58 [PATCH] input: cm109: fix URB submitted while active Pavel Skripkin
2021-08-18 11:07 ` Pavel Skripkin
2021-09-19 17:30   ` Pavel Skripkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).