Skip to content

Commit da16689

Browse files
johnkeepinggregkh
authored andcommitted
usb: gadget: f_midi: fix MIDI Streaming descriptor lengths
While the MIDI jacks are configured correctly, and the MIDIStreaming endpoint descriptors are filled with the correct information, bNumEmbMIDIJack and bLength are set incorrectly in these descriptors. This does not matter when the numbers of in and out ports are equal, but when they differ the host will receive broken descriptors with uninitialized stack memory leaking into the descriptor for whichever value is smaller. The precise meaning of "in" and "out" in the port counts is not clearly defined and can be confusing. But elsewhere the driver consistently uses this to match the USB meaning of IN and OUT viewed from the host, so that "in" ports send data to the host and "out" ports receive data from it. Cc: stable <[email protected]> Fixes: c8933c3 ("USB: gadget: f_midi: allow a dynamic number of input and output ports") Signed-off-by: John Keeping <[email protected]> Reviewed-by: Takashi Iwai <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 58cd423 commit da16689

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/usb/gadget/function/f_midi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,11 +1009,11 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f)
10091009
}
10101010

10111011
/* configure the endpoint descriptors ... */
1012-
ms_out_desc.bLength = USB_DT_MS_ENDPOINT_SIZE(midi->in_ports);
1013-
ms_out_desc.bNumEmbMIDIJack = midi->in_ports;
1012+
ms_out_desc.bLength = USB_DT_MS_ENDPOINT_SIZE(midi->out_ports);
1013+
ms_out_desc.bNumEmbMIDIJack = midi->out_ports;
10141014

1015-
ms_in_desc.bLength = USB_DT_MS_ENDPOINT_SIZE(midi->out_ports);
1016-
ms_in_desc.bNumEmbMIDIJack = midi->out_ports;
1015+
ms_in_desc.bLength = USB_DT_MS_ENDPOINT_SIZE(midi->in_ports);
1016+
ms_in_desc.bNumEmbMIDIJack = midi->in_ports;
10171017

10181018
/* ... and add them to the list */
10191019
endpoint_descriptor_index = i;

0 commit comments

Comments
 (0)