Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb_core: More legacy control API fixes

Browse source 
In the old API, usb_core_transfer_complete() would ignore
any completions on EP0. The legacy control API will also
ignore most completions on EP0, but it only did so after
filling in the completion event.

If the driver submits a spurious completion on EP0, then
this could clobber a previously queued completion event.

Fix this by deciding whether to ignore the completion
*before* modifying the event data.

Change-Id: I68526898a96efa594ada4e94bb6851aaaf12e92a
This commit is contained in:
Aidan MacDonald 2021-11-13 17:16:28 +00:00
parent a4e422db9e
commit f8810be6de
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
firmware/usbstack/usb_core.c
View file

@ -950,12 +950,8 @@ void usb_core_transfer_complete(int endpoint, int dir, int status, int length)
struct usb_transfer_completion_event_data* completion_event = struct usb_transfer_completion_event_data* completion_event =
&ep_data[endpoint].completion_event[EP_DIR(dir)]; &ep_data[endpoint].completion_event[EP_DIR(dir)];
completion_event->endpoint = endpoint; void* data0 = NULL;
completion_event->dir = dir; void* data1 = NULL;
completion_event->data[0] = NULL;
completion_event->data[1] = NULL;
completion_event->status = status;
completion_event->length = length;
#ifdef USB_LEGACY_CONTROL_API #ifdef USB_LEGACY_CONTROL_API
if(endpoint == EP_CONTROL) { if(endpoint == EP_CONTROL) {
@ -963,14 +959,21 @@ void usb_core_transfer_complete(int endpoint, int dir, int status, int length)
struct usb_ctrlrequest* req = active_request; struct usb_ctrlrequest* req = active_request;
if(dir == USB_DIR_OUT && req && cwdd) { if(dir == USB_DIR_OUT && req && cwdd) {
completion_event->data[0] = req; data0 = req;
completion_event->data[1] = control_write_data; data1 = control_write_data;
} else { } else {
return; return;
} }
} }
#endif #endif
completion_event->endpoint = endpoint;
completion_event->dir = dir;
completion_event->data[0] = data0;
completion_event->data[1] = data1;
completion_event->status = status;
completion_event->length = length;
usb_signal_transfer_completion(completion_event); usb_signal_transfer_completion(completion_event);
} }