From: Cédric Bosdonnat <cbosdonnat@suse.com>
Date: Mon, 3 Mar 2014 10:26:46 +0000 (+0100)
Subject: apparmor: handle "none" type
X-Git-Tag: v1.2.3-rc1~352
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9194ccecf1b7d2879fe771e506798d92ec6da3f2;p=thirdparty%2Flibvirt.git

apparmor: handle "none" type
---

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 1c1b128201..a74a91c21c 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -417,7 +417,8 @@ AppArmorGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
     if (!secdef)
         return -1;
 
-    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC)
+    if ((secdef->type == VIR_DOMAIN_SECLABEL_STATIC) ||
+        (secdef->type == VIR_DOMAIN_SECLABEL_NONE))
         return 0;
 
     if (secdef->baselabel) {
@@ -580,6 +581,9 @@ AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
     if (!secdef)
         return -1;
 
+    if (secdef->label == NULL)
+        return 0;
+
     if ((profile_name = get_profile_name(def)) == NULL)
         return rc;
 
@@ -626,6 +630,9 @@ AppArmorSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
     if (!secdef)
         goto cleanup;
 
+    if (secdef->label == NULL)
+        return 0;
+
     if (STRNEQ(SECURITY_APPARMOR_NAME, secdef->model)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("security label driver mismatch: "