summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2013-07-10 21:04:43 -0700
committerJohn Johansen <john.johansen@canonical.com>2013-08-14 11:42:05 -0700
commit9d910a3bc01008d432b3bb79a69e7e3cdb4821b2 (patch)
tree17ebc836d121720b95c8dc2d51980561800e6cab /security
parentc611616cd3cb27f9605ee4954532b3fe144d951b (diff)
downloadblackbird-obmc-linux-9d910a3bc01008d432b3bb79a69e7e3cdb4821b2.tar.gz
blackbird-obmc-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>
Diffstat (limited to 'security')
-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),
OpenPOWER on IntegriCloud