From: Marc Hartmayer <mhartmay@linux.ibm.com>
Date: Tue, 13 Nov 2018 16:32:29 +0000 (+0100)
Subject: virSecuritySELinuxTransactionCommit: Return -1 if no transaction is set
X-Git-Tag: v4.10.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1458746f0553bacf7aca7a4b37ed37c92b04f99c;p=thirdparty%2Flibvirt.git

virSecuritySELinuxTransactionCommit: Return -1 if no transaction is set

Return -1 and report an error message if no transaction is set and
virSecuritySELinuxTransactionCommit is called.

The function description of virSecuritySELinuxTransactionCommit says:

  "Also it is considered as error if there's no transaction set and this
   function is called."

Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index c09404f6f8..780d650c69 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1094,8 +1094,11 @@ virSecuritySELinuxTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
     int ret = -1;
 
     list = virThreadLocalGet(&contextList);
-    if (!list)
-        return 0;
+    if (!list) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("No transaction is set"));
+        return -1;
+    }
 
     if (virThreadLocalSet(&contextList, NULL) < 0) {
         virReportSystemError(errno, "%s",