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

qemu-usb: allocate host devices after webcam

Browse Source 
Because qemu-usb allocated host devices after 'USB_HOST_DEVICE' in the
object array and 'USB_WEBCAM' is loacated after 'USB_HOST_DEVICE' the
webcam model can overwrite an already allocated pass-through device. As
a solution add the 'USB_FIRST_FREE' to make it clear from where host
devices can be allocated. Also increase the number of supported host
devices to eight.

fixes #4182
This commit is contained in:
Sebastian Sumpf 2021-05-28 12:48:04 +02:00 committed by Christian Helmuth
parent 520b69ef0d
commit cf2527269f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repos/libports/src/lib/qemu-usb/qemu_emul.cc
View File

@ -277,8 +277,9 @@ struct Object_pool
USB_BUS, /* bus driver */
USB_DEVICE, /* USB device driver */
USB_HOST_DEVICE, /* USB host device driver */
USB_WEBCAM, /* USB host device driver */
MAX = 10 /* host devices (USB_HOST_DEVICE - MAX) */
USB_WEBCAM, /* USB webcam device driver */
USB_FIRST_FREE, /* first free device */
MAX = 14 /* host devices (USB_FIRST_FREE to MAX) */
};
bool used[MAX];
@ -286,7 +287,7 @@ struct Object_pool
Wrapper *create_object()
{
for (unsigned i = USB_HOST_DEVICE + 1; i < MAX; i++) {
for (unsigned i = USB_FIRST_FREE; i < MAX; i++) {
if (used[i] == false) {
used[i] = true;
return &obj[i];
@ -297,7 +298,7 @@ struct Object_pool
void free_object(Wrapper *w)
{
for (unsigned i = USB_HOST_DEVICE + 1; i < MAX; i++)
for (unsigned i = USB_FIRST_FREE; i < MAX; i++)
if (w == &obj[i]) {
used[i] = false;
break;