]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virSecuritySELinuxTransactionCommit: Return -1 if no transaction is set
authorMarc Hartmayer <mhartmay@linux.ibm.com>
Tue, 13 Nov 2018 16:32:29 +0000 (17:32 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 13 Nov 2018 17:36:15 +0000 (18:36 +0100)
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>
src/security/security_selinux.c

index c09404f6f833ccb688e2f8515713b2e17d8e934c..780d650c69ea7d84654e38818bc07400ec10eb46 100644 (file)
@@ -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",