mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-23 21:15:20 +00:00
Fix path used for USB device attach with LXC
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:
parent
9bb26f0909
commit
17fc85a20a
@ -3296,7 +3296,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
|
||||
(unsigned long long)priv->initpid) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virAsprintf(&dstdir, "%s/dev/bus/%03d",
|
||||
if (virAsprintf(&dstdir, "%s/dev/bus/usb/%03d",
|
||||
vroot,
|
||||
def->source.subsys.u.usb.bus) < 0)
|
||||
goto cleanup;
|
||||
@ -3361,7 +3361,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
|
||||
|
||||
if (virUSBDeviceFileIterate(usb,
|
||||
virLXCSetupHostUsbDeviceCgroup,
|
||||
&priv->cgroup) < 0)
|
||||
priv->cgroup) < 0)
|
||||
goto cleanup;
|
||||
|
||||
ret = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user