USB: chaoskey: fix error case of a timeout
Subsystems (2)
PATCH 1/1 USB: chaoskey: fix error case of a timeout
In case of a timeout or if a signal aborts a read communication with the device needs to be ended lest we overwrite an active URB the next time we do IO to the device, as the URB may still be active.
--- drivers/usb/misc/chaoskey.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/usb/misc/chaoskey.c +21 -3
@@ -384,13 +384,17 @@ static int _chaoskey_fill(struct chaoskey *dev) !dev->reading, (started ? NAK_TIMEOUT : ALEA_FIRST_TIMEOUT) ); -if (result <0 ) +if (result <0 ) { +usb_kill_urb (dev->urb); goto out; + } -if (result ==0 ) +if (result ==0 ) { result = -ETIMEDOUT ; -else +usb_kill_urb (dev->urb); + }else { result = dev->valid; + } out:/* Let the device go back to sleep eventually */ usb_autopm_put_interface (dev->interface);
@@ -526,7 +530,21 @@ static int chaoskey_suspend(struct usb_interface *interface,static int chaoskey_resume (struct usb_interface *interface) { +struct chaoskey *dev; +struct usb_device *udev =interface_to_usbdev (interface); +usb_dbg (interface,"resume" ); + dev =usb_get_intfdata (interface); + +/* +* We may have lost power. +* In that case the device that needs a long time +* for the first requests needs an extended timeout +* again +*/ +if (le16_to_cpu (udev->descriptor.idVendor) ==ALEA_VENDOR_ID ) + dev->reads_started = false; +return 0 ; }#else
Signature · 1 line
2.16.4
PATCH 1/1 USB: chaoskey: fix error case of a timeout
In case of a timeout or if a signal aborts a read communication with the device needs to be ended lest we overwrite an active URB the next time we do IO to the device, as the URB may still be active.
--- drivers/usb/misc/chaoskey.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/usb/misc/chaoskey.c +21 -3
@@ -384,13 +384,17 @@ static int _chaoskey_fill(struct chaoskey *dev) !dev->reading, (started ? NAK_TIMEOUT : ALEA_FIRST_TIMEOUT) ); -if (result <0 ) +if (result <0 ) { +usb_kill_urb (dev->urb); goto out; + } -if (result ==0 ) +if (result ==0 ) { result = -ETIMEDOUT ; -else +usb_kill_urb (dev->urb); + }else { result = dev->valid; + } out:/* Let the device go back to sleep eventually */ usb_autopm_put_interface (dev->interface);
@@ -526,7 +530,21 @@ static int chaoskey_suspend(struct usb_interface *interface,static int chaoskey_resume (struct usb_interface *interface) { +struct chaoskey *dev; +struct usb_device *udev =interface_to_usbdev (interface); +usb_dbg (interface,"resume" ); + dev =usb_get_intfdata (interface); + +/* +* We may have lost power. +* In that case the device that needs a long time +* for the first requests needs an extended timeout +* again +*/ +if (le16_to_cpu (udev->descriptor.idVendor) ==ALEA_VENDOR_ID ) + dev->reads_started = false; +return 0 ; }#else
Signature · 1 line
2.16.4
Greg KH
maintainerQuoted 42 lines · Oliver Neukum
In case of a timeout or if a signal aborts a read communication with the device needs to be ended lest we overwrite an active URB the next time we do IO to the device, as the URB may still be active.
Signed-off-by Oliver Neukum <[email protected]>--- drivers/usb/misc/chaoskey.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/usb/misc/chaoskey.c +10
-3@@ -384,13 +384,17 @@ static int _chaoskey_fill(struct chaoskey *dev) !dev->reading, (started ? NAK_TIMEOUT : ALEA_FIRST_TIMEOUT) ); -if (result <0 ) +if (result <0 ) { +usb_kill_urb (dev->urb); goto out; + } -if (result ==0 ) +if (result ==0 ) { result = -ETIMEDOUT ; -else +usb_kill_urb (dev->urb); + }else { result = dev->valid; + } out:/* Let the device go back to sleep eventually */ usb_autopm_put_interface (dev->interface);@@ -526,7 +530,21 @@ static int chaoskey_suspend(struct usb_interface *interface,static int chaoskey_resume (struct usb_interface *interface) { +struct chaoskey *dev; +struct usb_device *udev =interface_to_usbdev (interface); +
drivers/usb/misc/chaoskey.c static int chaoskey_suspend(struct usb_interface *interface, · line 545
Quoted 10 lines
drivers/usb/misc/chaoskey.c +9
-0usb_dbg (interface,"resume" ); + dev =usb_get_intfdata (interface); + +/* +* We may have lost power. +* In that case the device that needs a long time +* for the first requests needs an extended timeout +* again +*/ +if (le16_to_cpu (udev->descriptor.idVendor) ==ALEA_VENDOR_ID )
What is this helping with?
Quoted 8 lines
drivers/usb/misc/chaoskey.c +2
-0+ dev->reads_started = false; + return 0; }#else Signature · 1 line
2.16.4
Why send this twice?
And did this pass the syzbot testing?
thanks,
greg k-h
Am Donnerstag, den 07.11.2019, 16:01 +0100 schrieb Greg KH:
Quoted 47 lines · Oliver Neukum
Quoted 46 lines
In case of a timeout or if a signal aborts a read communication with the device needs to be ended lest we overwrite an active URB the next time we do IO to the device, as the URB may still be active.
Signed-off-by Oliver Neukum <[email protected]>--- drivers/usb/misc/chaoskey.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)drivers/usb/misc/chaoskey.c +13
-3@@ -384,13 +384,17 @@ static int _chaoskey_fill(struct chaoskey *dev) !dev->reading, (started ? NAK_TIMEOUT : ALEA_FIRST_TIMEOUT) ); -if (result <0 ) +if (result <0 ) { +usb_kill_urb (dev->urb); goto out; + } -if (result ==0 ) +if (result ==0 ) { result = -ETIMEDOUT ; -else +usb_kill_urb (dev->urb); + }else { result = dev->valid; + } out:/* Let the device go back to sleep eventually */ usb_autopm_put_interface (dev->interface);@@ -526,7 +530,21 @@ static int chaoskey_suspend(struct usb_interface *interface,static int chaoskey_resume (struct usb_interface *interface) { +struct chaoskey *dev; +struct usb_device *udev =interface_to_usbdev (interface); +usb_dbg (interface,"resume" ); + dev =usb_get_intfdata (interface); + +/*
Quoted 8 lines
drivers/usb/misc/chaoskey.c static int chaoskey_suspend(struct usb_interface *interface, · line 545
Quoted 6 lines
drivers/usb/misc/chaoskey.c +6
-0+* We may have lost power. +* In that case the device that needs a long time +* for the first requests needs an extended timeout +* again +*/ +if (le16_to_cpu (udev->descriptor.idVendor) ==ALEA_VENDOR_ID )What is this helping with?
THe quirk is specific for this model. The others do not need it.
Quoted 10 lines
Quoted 8 lines
drivers/usb/misc/chaoskey.c +2
-0+ dev->reads_started = false; + return 0; }#else Signature · 1 line
2.16.4Why send this twice?
There must be an issue in my scripts. Investigating.
Quoted 1 line
And did this pass the syzbot testing?
Inconclusive. The test crashed but in another place. I cannot claim that fix.
Regards
Oliver