can: mcba_usb: properly check endpoint type
Subsystems (4)
PATCH 1/1 can: mcba_usb: properly check endpoint type
Syzbot reported warning in usb_submit_urb() which is caused by wrong endpoint type. We should check that in endpoint is actually present to prevent this warning
Fail log:
usb 5-1: BOGUS urb xfer, pipe 3 != type 1
WARNING: CPU: 1 PID: 49 at drivers/usb/core/urb.c:502 usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 Modules linked in: CPU: 1 PID: 49 Comm: kworker/1:2 Not tainted 5.17.0-rc6-syzkaller-00184-g38f80f42147f #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 Workqueue: usb_hub_wq hub_event RIP: 0010:usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 ... Call Trace: <TASK> mcba_usb_start drivers/net/can/usb/mcba_usb.c:662 [inline] mcba_usb_probe+0x8a3/0xc50 drivers/net/can/usb/mcba_usb.c:858 usb_probe_interface+0x315/0x7f0 drivers/usb/core/driver.c:396 call_driver_probe drivers/base/dd.c:517 [inline]
---
Meta comments:
I am not an usb expert, but looks like this driver uses one endpoint for in and out transactions:
/* MCBA endpoint numbers */
#define MCBA_USB_EP_IN 1
#define MCBA_USB_EP_OUT 1
That's why check only for in endpoint is added
--- drivers/net/can/usb/mcba_usb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/can/usb/mcba_usb.c +7 -0
@@ -807,6 +807,13 @@ static int mcba_usb_probe(struct usb_interface *intf,struct mcba_priv *priv;int err;struct usb_device *usbdev =interface_to_usbdev (intf); +struct usb_endpoint_descriptor *in; + + err =usb_find_common_endpoints (intf->cur_altsetting, &in,NULL ,NULL ,NULL ); +if (err) { +dev_err (&intf->dev,"Can't find endpoints\n" ); +return -ENODEV ; + } netdev =alloc_candev (sizeof (struct mcba_priv ),MCBA_MAX_TX_URBS );if (!netdev) {
Signature · 1 line
2.35.1
Hi Pavel,
Quoted 1 line
[PATCH RFT] can:
mcba_usb: properly check endpoint type
It is RFC, not RFT :)
I guess you went on some manual editing. Next time, you can just let git add the tag for you by doing:
| git format-patch --rfc ...
Quoted 28 lines · Pavel Skripkin
Syzbot reported warning in
usb_submit_urb()which is caused by wrong endpoint type. We should check that in endpoint is actually present to prevent this warningFail log:
usb 5-1: BOGUS urb xfer, pipe 3 != type 1
WARNING: CPU: 1 PID: 49 at drivers/usb/core/urb.c:502 usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 Modules linked in: CPU: 1 PID: 49 Comm: kworker/1:2 Not tainted 5.17.0-rc6-syzkaller-00184-g38f80f42147f #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 Workqueue: usb_hub_wq hub_event RIP: 0010:usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 ... Call Trace: <TASK> mcba_usb_start drivers/net/can/usb/mcba_usb.c:662 [inline] mcba_usb_probe+0x8a3/0xc50 drivers/net/can/usb/mcba_usb.c:858 usb_probe_interface+0x315/0x7f0 drivers/usb/core/driver.c:396 call_driver_probe drivers/base/dd.c:517 [inline]Reported-and-tested-by [email protected]Fixes 51f3baad7de9 ("can: mcba_usb: Add support for Microchip CAN BUS Analyzer")Signed-off-by Pavel Skripkin <[email protected]>---
Meta comments:
Quoted 8 lines
I am not an usb expert, but looks like this driver uses one endpoint for in and out transactions:
/* MCBA endpoint numbers */
#defineMCBA_USB_EP_IN1
#defineMCBA_USB_EP_OUT1That's why check only for in endpoint is added
MCBA_USB_EP_{IN,OUT} are respectively used in usb_rcvbulkpipe() and usb_sndbulkpipe(). I invite you to have a look at what those macros do and you will understand that these returns two different pipes:
https://elixir.bootlin.com/linux/latest/source/include/linux/usb.h#L1964
In other words, ep_in and ep_out are some indexes of a different entity and do not conflict with each other.
Quoted 9 lines
--- drivers/net/can/usb/mcba_usb.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/net/can/usb/mcba_usb.c +0
-0
drivers/net/can/usb/mcba_usb.c static int mcba_usb_probe(struct usb_interface *intf, · line 812
Quoted 6 lines
drivers/net/can/usb/mcba_usb.c +3
-0@@ -807,6 +807,13 @@ static int mcba_usb_probe(struct usb_interface *intf,struct mcba_priv *priv;int err;struct usb_device *usbdev =interface_to_usbdev (intf); +struct usb_endpoint_descriptor *in; + + err =usb_find_common_endpoints (intf->cur_altsetting, &in,NULL ,NULL ,NULL );
If you go this direction, then please use usb_find_common_endpoint() to retrieve the value of both ep_in and ep_out and use them instead of MCBA_USB_EP_{IN,OUT}
drivers/net/can/usb/mcba_usb.c static int mcba_usb_probe(struct usb_interface *intf, · line 815
Quoted 3 lines
drivers/net/can/usb/mcba_usb.c +3
-0+if (err) { +dev_err (&intf->dev,"Can't find endpoints\n" ); +return -ENODEV ;
return ret;
Please keep the error code of usb_find_common_endpoint().
Quoted 6 lines
drivers/net/can/usb/mcba_usb.c +1
-0+ }netdev = alloc_candev(sizeof(struct mcba_priv), MCBA_MAX_TX_URBS); if (!netdev) {
Yours sincerely,
Vincent Mailhol
Hi Vincent,
Quoted 8 lines · Vincent MAILHOL
Hi Pavel,
Quoted 1 line
[PATCH RFT] can:
mcba_usb: properly check endpoint typeIt is RFC, not RFT :)
I guess you went on some manual editing. Next time, you can just let git add the tag for you by doing:
| git format-patch --rfc ...
I marked it as RFT, because I wanted someone to test it. But indeed with my lack of usb knowledge it should have been RFC :)
Quoted 2 lines · Pavel Skripkin
[snip]
Quoted 11 lines
Quoted 5 lines
/* MCBA endpoint numbers */
#defineMCBA_USB_EP_IN1
#defineMCBA_USB_EP_OUT1That's why check only for in endpoint is added
MCBA_USB_EP_{IN,OUT} are respectively used in
usb_rcvbulkpipe()andusb_sndbulkpipe(). I invite you to have a look at what those macros do and you will understand that these returns two different pipes:
Quoted 5 lines
https://elixir.bootlin.com/linux/latest/source/include/linux/usb.h#L1964
In other words,
ep_inandep_outare some indexes of a different entity and do not conflict with each other.
Got it! Thank you for pointing out!
Quoted 20 lines
Quoted 9 lines
--- drivers/net/can/usb/mcba_usb.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/net/can/usb/mcba_usb.c +0
-0drivers/net/can/usb/mcba_usb.c static int mcba_usb_probe(struct usb_interface *intf, · line 812
Quoted 6 lines
drivers/net/can/usb/mcba_usb.c +3
-0@@ -807,6 +807,13 @@ static int mcba_usb_probe(struct usb_interface *intf,struct mcba_priv *priv;int err;struct usb_device *usbdev =interface_to_usbdev (intf); +struct usb_endpoint_descriptor *in; + + err =usb_find_common_endpoints (intf->cur_altsetting, &in,NULL ,NULL ,NULL );If you go this direction, then please use
usb_find_common_endpoint()to retrieve the value of bothep_inandep_outand use them instead of MCBA_USB_EP_{IN,OUT}
Quoted 8 lines
drivers/net/can/usb/mcba_usb.c static int mcba_usb_probe(struct usb_interface *intf, · line 815
Quoted 3 lines
drivers/net/can/usb/mcba_usb.c +3
-0+if (err) { +dev_err (&intf->dev,"Can't find endpoints\n" ); +return -ENODEV ;return ret;
Please keep the error code of
usb_find_common_endpoint().
Will redo in v2. Thank you for reviewing
With regards,
Pavel Skripkin
Yasushi SHOJI
reviewerHi Pavel,
Quoted 10 lines · Pavel Skripkin
Quoted 6 lines · Vincent MAILHOL
Quoted 1 line
[PATCH RFT] can:
mcba_usb: properly check endpoint typeIt is RFC, not RFT :)
I guess you went on some manual editing. Next time, you can just let git add the tag for you by doing:
| git format-patch --rfc ...I marked it as RFT, because I wanted someone to test it. But indeed with my lack of usb knowledge it should have been RFC :)
l didn't know RFT to mean "Request for Testing" :D
I have the device and do testing. Do you have test code I can run?
Best Regards,
Signature · 1 line
yashi
Hi Yasushi,
Quoted 11 lines · Yasushi SHOJI
Hi Pavel,
Quoted 8 lines · Pavel Skripkin
Quoted 6 lines · Vincent MAILHOL
Quoted 1 line
[PATCH RFT] can:
mcba_usb: properly check endpoint typeIt is RFC, not RFT :)
I guess you went on some manual editing. Next time, you can just let git add the tag for you by doing:
| git format-patch --rfc ...
Quoted 7 lines
Quoted 2 lines
I marked it as RFT, because I wanted someone to test it. But indeed with my lack of usb knowledge it should have been RFC :)
l didn't know RFT to mean "Request for Testing" :D
I have the device and do testing. Do you have test code I can run?
Sorry for late reply, this mail got somehow lost in my inbox.
I don't have any code and even this device.
I think, if with this patch applied driver probes and in-out stream works nice then this patch is correct :)
With regards,
Pavel Skripkin
PATCH v2 1/1 can: mcba_usb: properly check endpoint type
In reply to Vincent MAILHOLSyzbot reported warning in usb_submit_urb() which is caused by wrong endpoint type. We should check that in endpoint is actually present to prevent this warning
Found pipes are now saved to struct mcba_priv and code uses them directly instead of making pipes in place.
Fail log:
usb 5-1: BOGUS urb xfer, pipe 3 != type 1
WARNING: CPU: 1 PID: 49 at drivers/usb/core/urb.c:502 usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 Modules linked in: CPU: 1 PID: 49 Comm: kworker/1:2 Not tainted 5.17.0-rc6-syzkaller-00184-g38f80f42147f #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 Workqueue: usb_hub_wq hub_event RIP: 0010:usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 ... Call Trace: <TASK> mcba_usb_start drivers/net/can/usb/mcba_usb.c:662 [inline] mcba_usb_probe+0x8a3/0xc50 drivers/net/can/usb/mcba_usb.c:858 usb_probe_interface+0x315/0x7f0 drivers/usb/core/driver.c:396 call_driver_probe drivers/base/dd.c:517 [inline]
---
Changes from RFT(RFC):
- Add missing out pipe check
- Use found pipes instead of making pipes in place
- Do not hide usb_find_common_endpoints() error
--- drivers/net/can/usb/mcba_usb.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/net/can/usb/mcba_usb.c +15 -7
@@ -33,10 +33,6 @@#define MCBA_USB_RX_BUFF_SIZE 64#define MCBA_USB_TX_BUFF_SIZE (sizeof(struct mcba_usb_msg)) -/* MCBA endpoint numbers */ -#define MCBA_USB_EP_IN 1 -#define MCBA_USB_EP_OUT 1 -/* Microchip command id */ #define MBCA_CMD_RECEIVE_MESSAGE 0xE3#define MBCA_CMD_I_AM_ALIVE_FROM_CAN 0xF5
@@ -83,6 +79,8 @@ struct mcba_priv {atomic_t free_ctx_cnt;void *rxbuf[MCBA_MAX_RX_URBS ];dma_addr_t rxbuf_dma[MCBA_MAX_RX_URBS ]; +int rx_pipe; +int tx_pipe; };/* CAN frame */
@@ -269,7 +267,7 @@ static netdev_tx_t mcba_usb_xmit(struct mcba_priv *priv,memcpy (buf, usb_msg,MCBA_USB_TX_BUFF_SIZE );usb_fill_bulk_urb (urb, priv->udev, -usb_sndbulkpipe (priv->udev,MCBA_USB_EP_OUT ), buf, + priv->tx_pipe, buf,MCBA_USB_TX_BUFF_SIZE , mcba_usb_write_bulk_callback, ctx);
@@ -608,7 +606,7 @@ static void mcba_usb_read_bulk_callback(struct urb *urb) resubmit_urb:usb_fill_bulk_urb (urb, priv->udev, -usb_rcvbulkpipe (priv->udev,MCBA_USB_EP_OUT ), + priv->rx_pipe, urb->transfer_buffer,MCBA_USB_RX_BUFF_SIZE , mcba_usb_read_bulk_callback, priv);
@@ -653,7 +651,7 @@ static int mcba_usb_start(struct mcba_priv *priv) urb->transfer_dma = buf_dma;usb_fill_bulk_urb (urb, priv->udev, -usb_rcvbulkpipe (priv->udev,MCBA_USB_EP_IN ), + priv->rx_pipe, buf,MCBA_USB_RX_BUFF_SIZE , mcba_usb_read_bulk_callback, priv); urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;
@@ -807,6 +805,13 @@ static int mcba_usb_probe(struct usb_interface *intf,struct mcba_priv *priv;int err;struct usb_device *usbdev =interface_to_usbdev (intf); +struct usb_endpoint_descriptor *in, *out; + + err =usb_find_common_endpoints (intf->cur_altsetting, &in, &out,NULL ,NULL ); +if (err) { +dev_err (&intf->dev,"Can't find endpoints\n" ); +return err; + } netdev =alloc_candev (sizeof (struct mcba_priv ),MCBA_MAX_TX_URBS );if (!netdev) {
@@ -852,6 +857,9 @@ static int mcba_usb_probe(struct usb_interface *intf, goto cleanup_free_candev; } + priv->rx_pipe =usb_rcvbulkpipe (priv->udev, in->bEndpointAddress); + priv->tx_pipe =usb_sndbulkpipe (priv->udev, out->bEndpointAddress); +devm_can_led_init (netdev);/* Start USB dev only if we have successfully registered CAN device */
Signature · 1 line
2.35.1
Quoted 63 lines · Pavel Skripkin
Syzbot reported warning in
usb_submit_urb()which is caused by wrong endpoint type. We should check that in endpoint is actually present to prevent this warningFound pipes are now saved to struct
mcba_privand code uses them directly instead of making pipes in place.Fail log:
usb 5-1: BOGUS urb xfer, pipe 3 != type 1
WARNING: CPU: 1 PID: 49 at drivers/usb/core/urb.c:502 usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 Modules linked in: CPU: 1 PID: 49 Comm: kworker/1:2 Not tainted 5.17.0-rc6-syzkaller-00184-g38f80f42147f #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 Workqueue: usb_hub_wq hub_event RIP: 0010:usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 ... Call Trace: <TASK> mcba_usb_start drivers/net/can/usb/mcba_usb.c:662 [inline] mcba_usb_probe+0x8a3/0xc50 drivers/net/can/usb/mcba_usb.c:858 usb_probe_interface+0x315/0x7f0 drivers/usb/core/driver.c:396 call_driver_probe drivers/base/dd.c:517 [inline]Reported-and-tested-by [email protected]Fixes 51f3baad7de9 ("can: mcba_usb: Add support for Microchip CAN BUS Analyzer")Signed-off-by Pavel Skripkin <[email protected]>---
Changes from RFT(RFC):
- Add missing out pipe check
- Use found pipes instead of making pipes in place
- Do not hideusb_find_common_endpoints()error--- drivers/net/can/usb/mcba_usb.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)drivers/net/can/usb/mcba_usb.c +2
-4@@ -33,10 +33,6 @@#define MCBA_USB_RX_BUFF_SIZE 64#define MCBA_USB_TX_BUFF_SIZE (sizeof(struct mcba_usb_msg)) -/* MCBA endpoint numbers */ -#define MCBA_USB_EP_IN 1 -#define MCBA_USB_EP_OUT 1 -/* Microchip command id */ #define MBCA_CMD_RECEIVE_MESSAGE 0xE3#define MBCA_CMD_I_AM_ALIVE_FROM_CAN 0xF5@@ -83,6 +79,8 @@ struct mcba_priv {atomic_t free_ctx_cnt;void *rxbuf[MCBA_MAX_RX_URBS ];dma_addr_t rxbuf_dma[MCBA_MAX_RX_URBS ]; +int rx_pipe; +int tx_pipe; };/* CAN frame */
drivers/net/can/usb/mcba_usb.c static netdev_tx_t mcba_usb_xmit(struct mcba_priv *priv, · line 270
Quoted 5 lines
drivers/net/can/usb/mcba_usb.c +1
-1@@ -269,7 +267,7 @@ static netdev_tx_t mcba_usb_xmit(struct mcba_priv *priv,memcpy (buf, usb_msg,MCBA_USB_TX_BUFF_SIZE ); usb_fill_bulk_urb(urb, priv->udev, - usb_sndbulkpipe(priv->udev, MCBA_USB_EP_OUT), buf, + priv->tx_pipe, buf,
Nitpick: you might want to put more arguments per line (up to the 80 characters limit).
Quoted 36 lines
drivers/net/can/usb/mcba_usb.c +9
-2MCBA_USB_TX_BUFF_SIZE , mcba_usb_write_bulk_callback, ctx);@@ -608,7 +606,7 @@ static void mcba_usb_read_bulk_callback(struct urb *urb) resubmit_urb:usb_fill_bulk_urb (urb, priv->udev, -usb_rcvbulkpipe (priv->udev,MCBA_USB_EP_OUT ), + priv->rx_pipe, urb->transfer_buffer,MCBA_USB_RX_BUFF_SIZE , mcba_usb_read_bulk_callback, priv);@@ -653,7 +651,7 @@ static int mcba_usb_start(struct mcba_priv *priv) urb->transfer_dma = buf_dma;usb_fill_bulk_urb (urb, priv->udev, -usb_rcvbulkpipe (priv->udev,MCBA_USB_EP_IN ), + priv->rx_pipe, buf,MCBA_USB_RX_BUFF_SIZE , mcba_usb_read_bulk_callback, priv); urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;@@ -807,6 +805,13 @@ static int mcba_usb_probe(struct usb_interface *intf,struct mcba_priv *priv;int err;struct usb_device *usbdev =interface_to_usbdev (intf); +struct usb_endpoint_descriptor *in, *out; + + err =usb_find_common_endpoints (intf->cur_altsetting, &in, &out,NULL ,NULL ); +if (err) { +dev_err (&intf->dev,"Can't find endpoints\n" ); +return err; + } netdev =alloc_candev (sizeof (struct mcba_priv ),MCBA_MAX_TX_URBS );if (!netdev) {
drivers/net/can/usb/mcba_usb.c static int mcba_usb_probe(struct usb_interface *intf, · line 865
Quoted 9 lines
drivers/net/can/usb/mcba_usb.c +3
-0@@ -852,6 +857,9 @@ static int mcba_usb_probe(struct usb_interface *intf, goto cleanup_free_candev; } + priv->rx_pipe =usb_rcvbulkpipe (priv->udev, in->bEndpointAddress); + priv->tx_pipe =usb_sndbulkpipe (priv->udev, out->bEndpointAddress); +devm_can_led_init (netdev);/* Start USB dev only if we have successfully registered CAN device */
Aside from the nitpick, it looks good to me.
Yours sincerely,
Vincent Mailhol
PATCH v3 1/1 can: mcba_usb: properly check endpoint type
Syzbot reported warning in usb_submit_urb() which is caused by wrong endpoint type. We should check that in endpoint is actually present to prevent this warning
Found pipes are now saved to struct mcba_priv and code uses them directly instead of making pipes in place.
Fail log:
usb 5-1: BOGUS urb xfer, pipe 3 != type 1
WARNING: CPU: 1 PID: 49 at drivers/usb/core/urb.c:502 usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 Modules linked in: CPU: 1 PID: 49 Comm: kworker/1:2 Not tainted 5.17.0-rc6-syzkaller-00184-g38f80f42147f #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 Workqueue: usb_hub_wq hub_event RIP: 0010:usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 ... Call Trace: <TASK> mcba_usb_start drivers/net/can/usb/mcba_usb.c:662 [inline] mcba_usb_probe+0x8a3/0xc50 drivers/net/can/usb/mcba_usb.c:858 usb_probe_interface+0x315/0x7f0 drivers/usb/core/driver.c:396 call_driver_probe drivers/base/dd.c:517 [inline]
---
Changes from v2:
- Coding style error fixed
Changes from RFT(RFC):
- Add missing out pipe check
- Use found pipes instead of making pipes in place
- Do not hide usb_find_common_endpoints() error
--- drivers/net/can/usb/mcba_usb.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/net/can/usb/mcba_usb.c +16 -10
@@ -33,10 +33,6 @@#define MCBA_USB_RX_BUFF_SIZE 64#define MCBA_USB_TX_BUFF_SIZE (sizeof(struct mcba_usb_msg)) -/* MCBA endpoint numbers */ -#define MCBA_USB_EP_IN 1 -#define MCBA_USB_EP_OUT 1 -/* Microchip command id */ #define MBCA_CMD_RECEIVE_MESSAGE 0xE3#define MBCA_CMD_I_AM_ALIVE_FROM_CAN 0xF5
@@ -83,6 +79,8 @@ struct mcba_priv {atomic_t free_ctx_cnt;void *rxbuf[MCBA_MAX_RX_URBS ];dma_addr_t rxbuf_dma[MCBA_MAX_RX_URBS ]; +int rx_pipe; +int tx_pipe; };/* CAN frame */
@@ -268,10 +266,8 @@ static netdev_tx_t mcba_usb_xmit(struct mcba_priv *priv,memcpy (buf, usb_msg,MCBA_USB_TX_BUFF_SIZE ); -usb_fill_bulk_urb (urb, priv->udev, -usb_sndbulkpipe (priv->udev,MCBA_USB_EP_OUT ), buf, -MCBA_USB_TX_BUFF_SIZE , mcba_usb_write_bulk_callback, - ctx); +usb_fill_bulk_urb (urb, priv->udev, priv->tx_pipe, buf,MCBA_USB_TX_BUFF_SIZE , + mcba_usb_write_bulk_callback, ctx); urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;usb_anchor_urb (urb, &priv->tx_submitted);
@@ -608,7 +604,7 @@ static void mcba_usb_read_bulk_callback(struct urb *urb) resubmit_urb:usb_fill_bulk_urb (urb, priv->udev, -usb_rcvbulkpipe (priv->udev,MCBA_USB_EP_OUT ), + priv->rx_pipe, urb->transfer_buffer,MCBA_USB_RX_BUFF_SIZE , mcba_usb_read_bulk_callback, priv);
@@ -653,7 +649,7 @@ static int mcba_usb_start(struct mcba_priv *priv) urb->transfer_dma = buf_dma;usb_fill_bulk_urb (urb, priv->udev, -usb_rcvbulkpipe (priv->udev,MCBA_USB_EP_IN ), + priv->rx_pipe, buf,MCBA_USB_RX_BUFF_SIZE , mcba_usb_read_bulk_callback, priv); urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;
@@ -807,6 +803,13 @@ static int mcba_usb_probe(struct usb_interface *intf,struct mcba_priv *priv;int err;struct usb_device *usbdev =interface_to_usbdev (intf); +struct usb_endpoint_descriptor *in, *out; + + err =usb_find_common_endpoints (intf->cur_altsetting, &in, &out,NULL ,NULL ); +if (err) { +dev_err (&intf->dev,"Can't find endpoints\n" ); +return err; + } netdev =alloc_candev (sizeof (struct mcba_priv ),MCBA_MAX_TX_URBS );if (!netdev) {
@@ -852,6 +855,9 @@ static int mcba_usb_probe(struct usb_interface *intf, goto cleanup_free_candev; } + priv->rx_pipe =usb_rcvbulkpipe (priv->udev, in->bEndpointAddress); + priv->tx_pipe =usb_sndbulkpipe (priv->udev, out->bEndpointAddress); +devm_can_led_init (netdev);/* Start USB dev only if we have successfully registered CAN device */
Signature · 1 line
2.35.1
Quoted 24 lines · Pavel Skripkin
Syzbot reported warning in
usb_submit_urb()which is caused by wrong endpoint type. We should check that in endpoint is actually present to prevent this warningFound pipes are now saved to struct
mcba_privand code uses them directly instead of making pipes in place.Fail log:
usb 5-1: BOGUS urb xfer, pipe 3 != type 1
WARNING: CPU: 1 PID: 49 at drivers/usb/core/urb.c:502 usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 Modules linked in: CPU: 1 PID: 49 Comm: kworker/1:2 Not tainted 5.17.0-rc6-syzkaller-00184-g38f80f42147f #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 Workqueue: usb_hub_wq hub_event RIP: 0010:usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 ... Call Trace: <TASK> mcba_usb_start drivers/net/can/usb/mcba_usb.c:662 [inline] mcba_usb_probe+0x8a3/0xc50 drivers/net/can/usb/mcba_usb.c:858 usb_probe_interface+0x315/0x7f0 drivers/usb/core/driver.c:396 call_driver_probe drivers/base/dd.c:517 [inline]
Quoted 4 lines
Reported-and-tested-by [email protected]Fixes 51f3baad7de9 ("can: mcba_usb: Add support for Microchip CAN BUS Analyzer")Signed-off-by Pavel Skripkin <[email protected]>Reviewed-by Vincent Mailhol <[email protected]>
gentle ping. looks like this patch got somehow lost
With regards,
Pavel Skripkin