]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: reorder checks for safety
authorEric Blake <eblake@redhat.com>
Mon, 6 Jun 2011 19:07:11 +0000 (13:07 -0600)
committerEric Blake <eblake@redhat.com>
Wed, 8 Jun 2011 11:28:20 +0000 (05:28 -0600)
Detected by Coverity.  All existing callers happen to be in
range, so this isn't too serious.

* src/qemu/qemu_cgroup.c (qemuCgroupControllerActive): Check
bounds before dereference.

src/qemu/qemu_cgroup.c

index eba1e73e98b501af429aa81e8dae841a77eb9262..1298924613d6b41a5f4ddd01165394ca90d48998 100644 (file)
@@ -48,10 +48,10 @@ bool qemuCgroupControllerActive(struct qemud_driver *driver,
 {
     if (driver->cgroup == NULL)
         return false;
-    if (!virCgroupMounted(driver->cgroup, controller))
-        return false;
     if (controller < 0 || controller >= VIR_CGROUP_CONTROLLER_LAST)
         return false;
+    if (!virCgroupMounted(driver->cgroup, controller))
+        return false;
     if (driver->cgroupControllers & (1 << controller))
         return true;
     return false;