From ae09988eb787df63d3bb298f713a3bbd77275901 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Fri, 18 Dec 2015 08:25:47 -0500 Subject: [PATCH] lxc_cgroup: Add check for NULL cgroup before AddTask call Commit id '71ce4759' altered the cgroup processing with respect to the call to virCgroupAddTask being moved out from lower layers into the calling layers especially for qemu processing of emulator and vcpu threads. The movement affected lxc insomuch as it is possible for a code path to return a NULL cgroup *and* a 0 return status via virCgroupNewPartition failure when virCgroupNewIgnoreError succeeded when virCgroupNewMachineManual returns. Coverity pointed out that would cause virCgroupAddTask to core. This patch will check for a NULL cgroup as well as the negative return and just return the NULL cgroup to the caller (as it would have previously) --- src/lxc/lxc_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 609e9eafd8..ef332e3658 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -501,7 +501,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, nnicindexes, nicindexes, def->resource->partition, -1, - &cgroup) < 0) + &cgroup) < 0 || !cgroup) goto cleanup; if (virCgroupAddTask(cgroup, initpid) < 0) { -- 2.47.2