From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 25 Nov 2015 20:45:08 +0000 (+0000)
Subject: apparmor: support lxc.aa_profile = unchanged
X-Git-Tag: lxc-1.0.9~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a224dc7c97605ec2287ac8d8c775c54b048f7dd1;p=thirdparty%2Flxc.git

apparmor: support lxc.aa_profile = unchanged

In which case lxc will not update the apparmor profile at all.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lsm/apparmor.c b/src/lxc/lsm/apparmor.c
index 157481419..d62c3ccf0 100644
--- a/src/lxc/lsm/apparmor.c
+++ b/src/lxc/lsm/apparmor.c
@@ -38,6 +38,7 @@ static int aa_enabled = 0;
 #define AA_DEF_PROFILE "lxc-container-default"
 #define AA_MOUNT_RESTR "/sys/kernel/security/apparmor/features/mount/mask"
 #define AA_ENABLED_FILE "/sys/module/apparmor/parameters/enabled"
+#define AA_UNCHANGED "unchanged"
 
 /* aa_getcon is not working right now.  Use our hand-rolled version below */
 static int apparmor_enabled(void)
@@ -135,6 +136,12 @@ static int apparmor_process_label_set(const char *label, int use_default,
 	if (!aa_enabled)
 		return 0;
 
+	/* user may request that we just ignore apparmor */
+	if (label && strcmp(label, AA_UNCHANGED) == 0) {
+		INFO("apparmor profile unchanged per user request");
+		return 0;
+	}
+
 	if (!label) {
 		if (use_default)
 			label = AA_DEF_PROFILE;