]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: don't request cgroup ACL access for /dev/net/tun
authorEric Blake <eblake@redhat.com>
Wed, 9 Mar 2011 22:05:00 +0000 (15:05 -0700)
committerEric Blake <eblake@redhat.com>
Thu, 10 Mar 2011 15:32:43 +0000 (08:32 -0700)
Since libvirt always passes /dev/net/tun to qemu via fd, we should
never trigger the cases where qemu tries to directly open the
device.  Therefore, it is safer to deny the cgroup device ACL.

* src/qemu/qemu_cgroup.c (defaultDeviceACL): Remove /dev/net/tun.
* src/qemu/qemu.conf (cgroup_device_acl): Reflect this change.

src/qemu/qemu.conf
src/qemu/qemu_cgroup.c

index 8c6b996ace95c1a06684b2d6f1c0eeffab22ee75..364f555363dfde14e770ddeee357261f805eb605 100644 (file)
 #    "/dev/null", "/dev/full", "/dev/zero",
 #    "/dev/random", "/dev/urandom",
 #    "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
-#    "/dev/rtc", "/dev/hpet", "/dev/net/tun",
+#    "/dev/rtc", "/dev/hpet",
 #]
 
 
index 9a7d42f678b9d75e9603b12024d067aa7a2091f1..8c3eee38de72d762ba38fcb291c185de834c1e92 100644 (file)
@@ -37,7 +37,7 @@ static const char *const defaultDeviceACL[] = {
     "/dev/null", "/dev/full", "/dev/zero",
     "/dev/random", "/dev/urandom",
     "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
-    "/dev/rtc", "/dev/hpet", "/dev/net/tun",
+    "/dev/rtc", "/dev/hpet",
     NULL,
 };
 #define DEVICE_PTY_MAJOR 136