diff mbox series

bluetooth: bfusb: Check the endpoint type at probe

Message ID 20220513124303.2192981-1-zheyuma97@gmail.com (mailing list archive)
State New, archived
Headers show
Series bluetooth: bfusb: Check the endpoint type at probe | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/checkpatch success Checkpatch PASS
tedd_an/gitlint fail bluetooth: bfusb: Check the endpoint type at probe 7: B1 Line exceeds max length (96>80): "[ 3.295916] WARNING: CPU: 0 PID: 33 at drivers/usb/core/urb.c:503 usb_submit_urb+0xcd9/0x18b0"
tedd_an/subjectprefix fail "Bluetooth: " is not specified in the subject
tedd_an/buildkernel success Build Kernel PASS
tedd_an/buildkernel32 success Build Kernel32 PASS
tedd_an/incremental_build success Pass
tedd_an/testrunnersetup success Test Runner Setup PASS
tedd_an/testrunnerl2cap-tester success Total: 40, Passed: 40 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnerbnep-tester success Total: 1, Passed: 1 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnermgmt-tester success Total: 493, Passed: 493 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnerrfcomm-tester success Total: 10, Passed: 10 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnersco-tester success Total: 12, Passed: 12 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunnersmp-tester success Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0
tedd_an/testrunneruserchan-tester success Total: 4, Passed: 4 (100.0%), Failed: 0, Not Run: 0

Commit Message

Zheyu Ma May 13, 2022, 12:43 p.m. UTC
The driver reported an warning in usb_submit_urb() which is caused by
wrong endpoint type.

[    3.295630] usb 1-1: BOGUS urb xfer, pipe 3 != type 1
[    3.295916] WARNING: CPU: 0 PID: 33 at drivers/usb/core/urb.c:503 usb_submit_urb+0xcd9/0x18b0
[    3.298155] RIP: 0010:usb_submit_urb+0xcd9/0x18b0
[    3.302451] Call Trace:
[    3.302580]  <TASK>
[    3.302698]  bfusb_rx_submit+0x24e/0x390 [bfusb]
[    3.302938]  bfusb_open+0x50/0x90 [bfusb]

Fix this by checking the endpoint type at first.

Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
---
 drivers/bluetooth/bfusb.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Marcel Holtmann May 13, 2022, 12:53 p.m. UTC | #1
Hi Zheyu,

> The driver reported an warning in usb_submit_urb() which is caused by
> wrong endpoint type.
> 
> [    3.295630] usb 1-1: BOGUS urb xfer, pipe 3 != type 1
> [    3.295916] WARNING: CPU: 0 PID: 33 at drivers/usb/core/urb.c:503 usb_submit_urb+0xcd9/0x18b0
> [    3.298155] RIP: 0010:usb_submit_urb+0xcd9/0x18b0
> [    3.302451] Call Trace:
> [    3.302580]  <TASK>
> [    3.302698]  bfusb_rx_submit+0x24e/0x390 [bfusb]
> [    3.302938]  bfusb_open+0x50/0x90 [bfusb]
> 
> Fix this by checking the endpoint type at first.
> 
> Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
> ---
> drivers/bluetooth/bfusb.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
> index cab93935cc7f..447b6876c552 100644
> --- a/drivers/bluetooth/bfusb.c
> +++ b/drivers/bluetooth/bfusb.c
> @@ -613,7 +613,9 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
> 	bulk_out_ep = &intf->cur_altsetting->endpoint[0];
> 	bulk_in_ep  = &intf->cur_altsetting->endpoint[1];
> 
> -	if (!bulk_out_ep || !bulk_in_ep) {
> +	if (!bulk_out_ep || !bulk_in_ep ||
> +		!usb_endpoint_is_bulk_out(&bulk_out_ep->desc) ||
> +		!usb_endpoint_is_bulk_in(&bulk_in_ep->desc)) {
> 		BT_ERR("Bulk endpoints not found");
> 		goto done;
> 	}

how are you getting this. This driver only works on one specific piece of hardware.

Regards

Marcel
Zheyu Ma May 13, 2022, 1:25 p.m. UTC | #2
On Fri, May 13, 2022 at 8:53 PM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> Hi Zheyu,
>
> > The driver reported an warning in usb_submit_urb() which is caused by
> > wrong endpoint type.
> >
> > [    3.295630] usb 1-1: BOGUS urb xfer, pipe 3 != type 1
> > [    3.295916] WARNING: CPU: 0 PID: 33 at drivers/usb/core/urb.c:503 usb_submit_urb+0xcd9/0x18b0
> > [    3.298155] RIP: 0010:usb_submit_urb+0xcd9/0x18b0
> > [    3.302451] Call Trace:
> > [    3.302580]  <TASK>
> > [    3.302698]  bfusb_rx_submit+0x24e/0x390 [bfusb]
> > [    3.302938]  bfusb_open+0x50/0x90 [bfusb]
> >
> > Fix this by checking the endpoint type at first.
> >
> > Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
> > ---
> > drivers/bluetooth/bfusb.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
> > index cab93935cc7f..447b6876c552 100644
> > --- a/drivers/bluetooth/bfusb.c
> > +++ b/drivers/bluetooth/bfusb.c
> > @@ -613,7 +613,9 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
> >       bulk_out_ep = &intf->cur_altsetting->endpoint[0];
> >       bulk_in_ep  = &intf->cur_altsetting->endpoint[1];
> >
> > -     if (!bulk_out_ep || !bulk_in_ep) {
> > +     if (!bulk_out_ep || !bulk_in_ep ||
> > +             !usb_endpoint_is_bulk_out(&bulk_out_ep->desc) ||
> > +             !usb_endpoint_is_bulk_in(&bulk_in_ep->desc)) {
> >               BT_ERR("Bulk endpoints not found");
> >               goto done;
> >       }
>
> how are you getting this. This driver only works on one specific piece of hardware.

Actually, I used a virtual device to test the driver, and got the above warning.
The USB device may be programmable and malicious, so the driver should
carefully treat the input that the device provided.

Regards,
Zheyu Ma
bluez.test.bot@gmail.com May 13, 2022, 1:48 p.m. UTC | #3
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=641391

---Test result---

Test Summary:
CheckPatch                    PASS      1.62 seconds
GitLint                       FAIL      1.00 seconds
SubjectPrefix                 FAIL      0.85 seconds
BuildKernel                   PASS      37.39 seconds
BuildKernel32                 PASS      32.48 seconds
Incremental Build with patchesPASS      43.17 seconds
TestRunner: Setup             PASS      542.39 seconds
TestRunner: l2cap-tester      PASS      19.03 seconds
TestRunner: bnep-tester       PASS      6.79 seconds
TestRunner: mgmt-tester       PASS      116.84 seconds
TestRunner: rfcomm-tester     PASS      10.85 seconds
TestRunner: sco-tester        PASS      10.37 seconds
TestRunner: smp-tester        PASS      10.63 seconds
TestRunner: userchan-tester   PASS      7.00 seconds

Details
##############################
Test: GitLint - FAIL - 1.00 seconds
Run gitlint with rule in .gitlint
bluetooth: bfusb: Check the endpoint type at probe
7: B1 Line exceeds max length (96>80): "[    3.295916] WARNING: CPU: 0 PID: 33 at drivers/usb/core/urb.c:503 usb_submit_urb+0xcd9/0x18b0"


##############################
Test: SubjectPrefix - FAIL - 0.85 seconds
Check subject contains "Bluetooth" prefix
"Bluetooth: " is not specified in the subject



---
Regards,
Linux Bluetooth
diff mbox series

Patch

diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index cab93935cc7f..447b6876c552 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -613,7 +613,9 @@  static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 	bulk_out_ep = &intf->cur_altsetting->endpoint[0];
 	bulk_in_ep  = &intf->cur_altsetting->endpoint[1];
 
-	if (!bulk_out_ep || !bulk_in_ep) {
+	if (!bulk_out_ep || !bulk_in_ep ||
+		!usb_endpoint_is_bulk_out(&bulk_out_ep->desc) ||
+		!usb_endpoint_is_bulk_in(&bulk_in_ep->desc)) {
 		BT_ERR("Bulk endpoints not found");
 		goto done;
 	}