From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 22 Oct 2020 07:56:46 +0000 (+0200)
Subject: virCgroupKillRecursive: Return -1 on failure condition
X-Git-Tag: v6.9.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0778cff2aedd1da142562c396d482335df18e620;p=thirdparty%2Flibvirt.git

virCgroupKillRecursive: Return -1 on failure condition

virCgroupKillRecursive sneakily initializes 'ret' to 0 rather than the
usual -1. 401030499bf moved an error condition but didn't actually
modify 'ret' return the proper error code.

Fixes: 401030499bf
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index d408e3366f..5f4cb01bc0 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -2591,6 +2591,7 @@ virCgroupKillRecursive(virCgroupPtr group, int signum)
     if (!backends || !backendAvailable) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("no cgroup backend available"));
+        ret = -1;
         goto cleanup;
     }