External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 04:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix path used for USB device attach with LXC

Browse Source 
The LXC code missed the 'usb' component out of the path
/dev/bus/usb/$BUSNUM/$DEVNUM, so it failed to actually
setup cgroups for the device. This was in fact lucky
because the call to virLXCSetupHostUsbDeviceCgroup
was also mistakenly passing '&priv->cgroup' instead of
just 'priv->cgroup'. So once the path is fixed, libvirtd
would then crash trying to access the bogus virCgroupPtr
pointer. This would have been a security issue, were it
not for the bogus path preventing the pointer reference
being reached.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit c3648972222d4eb056e6e667c193ba56a7aa3557)
This commit is contained in:
Daniel P. Berrange 2014-02-04 16:43:18 +00:00
parent 8ee7bd55c2
commit e2a0b1a6b4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/lxc_driver.c
View File

@ -3338,7 +3338,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
(unsigned long long)priv->initpid) < 0) (unsigned long long)priv->initpid) < 0)
goto cleanup; goto cleanup;
if (virAsprintf(&dstdir, "%s/dev/bus/%03d", if (virAsprintf(&dstdir, "%s/dev/bus/usb/%03d",
vroot, vroot,
def->source.subsys.u.usb.bus) < 0) def->source.subsys.u.usb.bus) < 0)
goto cleanup; goto cleanup;
@ -3403,7 +3403,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
if (virUSBDeviceFileIterate(usb, if (virUSBDeviceFileIterate(usb,
virLXCSetupHostUsbDeviceCgroup, virLXCSetupHostUsbDeviceCgroup,
&priv->cgroup) < 0) priv->cgroup) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;