summaryrefslogtreecommitdiffstats
path: root/security/apparmor/apparmorfs.c
diff options
context:
space:
mode:
authorKees Cook <kees@ubuntu.com>2012-01-26 16:29:23 -0800
committerJohn Johansen <john.johansen@canonical.com>2012-02-27 11:38:19 -0800
commitd384b0a1a35f87f0ad70c29518f98f922b1c15cb (patch)
tree42560d316dffc636a424e7fa8173400723dcc4e7 /security/apparmor/apparmorfs.c
parenta9bf8e9fd561ba9ff1f0f2a1d96e439fcedaaaa4 (diff)
downloadlinux-stable-d384b0a1a35f87f0ad70c29518f98f922b1c15cb.tar.gz
linux-stable-d384b0a1a35f87f0ad70c29518f98f922b1c15cb.tar.bz2
linux-stable-d384b0a1a35f87f0ad70c29518f98f922b1c15cb.zip
AppArmor: export known rlimit names/value mappings in securityfs
Since the parser needs to know which rlimits are known to the kernel, export the list via a mask file in the "rlimit" subdirectory in the securityfs "features" directory. Signed-off-by: Kees Cook <kees@ubuntu.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/apparmorfs.c')
-rw-r--r--security/apparmor/apparmorfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index f9d0b5087bea..16c15ec6f670 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -25,6 +25,7 @@
#include "include/audit.h"
#include "include/context.h"
#include "include/policy.h"
+#include "include/resource.h"
/**
* aa_simple_write_to_buffer - common routine for getting policy from user
@@ -201,6 +202,7 @@ static struct aa_fs_entry aa_fs_entry_features[] = {
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),
+ AA_FS_DIR("rlimit", aa_fs_entry_rlimit),
{ }
};