mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
qemu_namespace: Don't unlink paths from cgroupDeviceACL
When building namespace for a domain there are couple of devices that are created independent of domain config (see qemuDomainPopulateDevices()). The idea behind is that these devices are crucial for QEMU or one of its libraries, or user is passing through a device and wants us to create it in the namespace too. That's the reason that these devices are allowed in the devices CGroup controller as well. However, during unplug it may happen that a device is configured to use one of such devices and since we remove /dev nodes on hotplug we would remove such device too. For example, /dev/urandom belongs onto the list of implicit devices and users can hotplug and hotunplug an RNG device with /dev/urandom as backend. The fix is fortunately simple - just consult the list of implicit devices before removing the device from the namespace. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
4aafdf1e1f
commit
9d749998b3
@ -1364,6 +1364,7 @@ qemuNamespaceUnlinkPaths(virDomainObj *vm,
|
||||
if (STRPREFIX(path, QEMU_DEVPREFIX)) {
|
||||
GStrv mount;
|
||||
bool inSubmount = false;
|
||||
const char *const *devices = (const char *const *)cfg->cgroupDeviceACL;
|
||||
|
||||
for (mount = devMountsPath; *mount; mount++) {
|
||||
if (STREQ(*mount, "/dev"))
|
||||
@ -1375,7 +1376,15 @@ qemuNamespaceUnlinkPaths(virDomainObj *vm,
|
||||
}
|
||||
}
|
||||
|
||||
if (!inSubmount)
|
||||
if (inSubmount)
|
||||
continue;
|
||||
|
||||
if (!devices)
|
||||
devices = defaultDeviceACL;
|
||||
|
||||
if (g_strv_contains(devices, path))
|
||||
continue;
|
||||
|
||||
unlinkPaths = g_slist_prepend(unlinkPaths, g_strdup(path));
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user