[apparmor] [PATCH 1/4] apparmor: remove advertising the support of network rules from compat iface

John Johansen john.johansen at canonical.com
Sat Jun 30 00:33:58 UTC 2012

The interface compatibility patch was advertising support of network rules,
however this is not true if the networking patch is not applied. Move
advertising of network rules into a third patch that can be applied if
both the compatibility and network patches are applied.

Signed-off-by: John Johansen <john.johansen at canonical.com>
 security/apparmor/apparmorfs-24.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/apparmor/apparmorfs-24.c b/security/apparmor/apparmorfs-24.c
index dc8c744..367c7ea 100644
--- a/security/apparmor/apparmorfs-24.c
+++ b/security/apparmor/apparmorfs-24.c
@@ -49,7 +49,7 @@ const struct file_operations aa_fs_matching_fops = {
 static ssize_t aa_features_read(struct file *file, char __user *buf,
 				size_t size, loff_t *ppos)
-	const char features[] = "file=3.1 capability=2.0 network=1.0 "
+	const char features[] = "file=3.1 capability=2.0 "
 	    "change_hat=1.5 change_profile=1.1 " "aanamespaces=1.1 rlimit=1.1";
 	return simple_read_from_buffer(buf, size, ppos, features,

More information about the AppArmor mailing list