summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Johansen2013-07-11 06:04:43 +0200
committerJohn Johansen2013-08-14 20:42:05 +0200
commit9d910a3bc01008d432b3bb79a69e7e3cdb4821b2 (patch)
tree17ebc836d121720b95c8dc2d51980561800e6cab
parentapparmor: enable users to query whether apparmor is enabled (diff)
downloadkernel-qcow2-linux-9d910a3bc01008d432b3bb79a69e7e3cdb4821b2.tar.gz
kernel-qcow2-linux-9d910a3bc01008d432b3bb79a69e7e3cdb4821b2.tar.xz
kernel-qcow2-linux-9d910a3bc01008d432b3bb79a69e7e3cdb4821b2.zip
apparmor: add a features/policy dir to interface
Add a policy directory to features to contain features that can affect policy compilation but do not affect mediation. Eg of such features would be types of dfa compression supported, etc. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Kees Cook <kees@ubuntu.com>
-rw-r--r--security/apparmor/apparmorfs.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 16c15ec6f670..ad6c74892b5f 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -198,7 +198,12 @@ static struct aa_fs_entry aa_fs_entry_domain[] = {
{ }
};
+static struct aa_fs_entry aa_fs_entry_policy[] = {
+ {}
+};
+
static struct aa_fs_entry aa_fs_entry_features[] = {
+ AA_FS_DIR("policy", aa_fs_entry_policy),
AA_FS_DIR("domain", aa_fs_entry_domain),
AA_FS_DIR("file", aa_fs_entry_file),
AA_FS_FILE_U64("capability", VFS_CAP_FLAGS_MASK),