ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-22 10:21:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Usb::Packet_handler: avoid completion handler recursion

Browse Source 
Fixes #2828
This commit is contained in:
Christian Prochaska 2018-05-14 14:35:10 +02:00 committed by Christian Helmuth
parent c6e4f5914e
commit c5f1ac615c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
repos/os/include/usb/packet_handler.h
View File

@ -32,7 +32,8 @@ class Usb::Packet_handler
Io_signal_handler<Packet_handler> _rpc_ready_submit { Io_signal_handler<Packet_handler> _rpc_ready_submit {
_ep, *this, &Packet_handler::_ready_handler }; _ep, *this, &Packet_handler::_ready_handler };
bool _ready_submit = true; bool _ready_submit = true;
bool _in_completion = false;
void _packet_handler() void _packet_handler()
{ {
@ -42,9 +43,11 @@ class Usb::Packet_handler
while (packet_avail()) { while (packet_avail()) {
Packet_descriptor p = _connection.source()->get_acked_packet(); Packet_descriptor p = _connection.source()->get_acked_packet();
if (p.completion) if (p.completion) {
_in_completion = true;
p.completion->complete(p); p.completion->complete(p);
else _in_completion = false;
} else
release(p); release(p);
} }
} }
@ -116,9 +119,10 @@ class Usb::Packet_handler
/* /*
* If an acknowledgement available signal occurred in the meantime, * If an acknowledgement available signal occurred in the meantime,
* retrieve packets. * retrieve packets, but avoid recursion if 'submit()' was called
* from the completion handler.
*/ */
if (packet_avail()) if (packet_avail() && !_in_completion)
_packet_handler(); _packet_handler();
} }