From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 5 Feb 2014 17:34:51 +0000 (+0100)
Subject: Generate a valid imagelabel even for type 'none'
X-Git-Tag: v1.2.2-rc1~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db9b0883c23d6c60ebca3f91f1f5ba4f8bd0587;p=thirdparty%2Flibvirt.git

Generate a valid imagelabel even for type 'none'

Commit 2ce63c1 added imagelabel generation when relabeling is turned
off. But we weren't filling out the sensitivity for type 'none' labels,
resulting in an invalid label:

$ virsh managedsave domain
error: unable to set security context 'system_u:object_r:svirt_image_t'
on fd 28: Invalid argument
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index aa47667b14..448f686ea2 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -670,7 +670,14 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr,
         break;
 
     case VIR_DOMAIN_SECLABEL_NONE:
-        /* no op */
+        if (virSecuritySELinuxMCSGetProcessRange(&sens,
+                                                 &catMin,
+                                                 &catMax) < 0)
+            goto cleanup;
+
+        if (VIR_STRDUP(mcs, sens) < 0)
+            goto cleanup;
+
         break;
 
     default: