Skip to content

cdcacm: Add the interface assoc descriptor to the length#12535

Merged
miri64 merged 1 commit intoRIOT-OS:masterfrom
bergzand:pr/usbus/cdcacm_assoc_len
Oct 22, 2019
Merged

cdcacm: Add the interface assoc descriptor to the length#12535
miri64 merged 1 commit intoRIOT-OS:masterfrom
bergzand:pr/usbus/cdcacm_assoc_len

Conversation

@bergzand
Copy link
Copy Markdown
Member

@bergzand bergzand commented Oct 21, 2019

Contribution description

The interface association descriptor length must be included in the descriptor length claimed by the descriptor generator, otherwise the USB stack will report an incorrect total descriptor length.

Testing procedure

Before this PR tests/usbus_cdc_acm_stdio should be either broken or the Linux kernel should report something along the lines of:

[415964.073466] usb 1-9.2.2: new full-speed USB device number 113 using xhci_hcd
[415964.151103] usb 1-9.2.2: config 1 has an invalid descriptor of length 7, skipping remainder of the config
[415964.151111] usb 1-9.2.2: config 1 interface 1 altsetting 0 has 0 endpoint descriptors, different from the interface descriptor's value: 2
[415964.151779] usb 1-9.2.2: New USB device found, idVendor=1209, idProduct=0001, bcdDevice= 0.00
[415964.151784] usb 1-9.2.2: New USB device strings: Mfr=3, Product=2, SerialNumber=0
[415964.151787] usb 1-9.2.2: Product: USB device
[415964.151790] usb 1-9.2.2: Manufacturer: RIOT-os.org
[415964.156518] cdc_acm: probe of 1-9.2.2:1.0 failed with error -22

This PR fixes that.

Issues/PRs references

Broken by #12430

@bergzand bergzand added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: USB Area: Universal Serial Bus labels Oct 21, 2019
@bergzand bergzand requested review from benpicco and dylad October 21, 2019 18:32
@bergzand bergzand mentioned this pull request Oct 21, 2019
Merged
chrysn
chrysn approved these changes Oct 22, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@chrysn chrysn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirming that the misbehavior was recently introduced in master, and is fixed by this patch. History confirmed on a custom board branch with the saul example (CDC-ACM only), tested also in combination with CDC-ECM in the gcoap example.

miri64
miri64 approved these changes Oct 22, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@miri64 miri64 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proxy-ACK. You know better than I what you are doing ;-)

@miri64 miri64 merged commit 789cbb9 into RIOT-OS:master Oct 22, 2019
@dylad dylad added this to the Release 2020.01 milestone Oct 22, 2019
@bergzand bergzand mentioned this pull request Oct 24, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chrysn chrysn chrysn approved these changes

@miri64 miri64 miri64 approved these changes

@benpicco benpicco Awaiting requested review from benpicco

@dylad dylad Awaiting requested review from dylad dylad is a code owner

Assignees

No one assigned

Labels

Area: USB Area: Universal Serial Bus CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2020.01

Development

Successfully merging this pull request may close these issues.

4 participants

@bergzand @chrysn @miri64 @dylad