diff options
author | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
commit | dd0a11815a339d6deeea8357574f8126a8404c92 (patch) | |
tree | c3c743ac6323e1caf9e987d6946cc4b2333a8256 /security/apparmor/capability.c | |
parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) |
Merge tag 'v3.12'
Linux 3.12
Diffstat (limited to 'security/apparmor/capability.c')
-rw-r--r-- | security/apparmor/capability.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c index 887a5e948945..84d1f5f53877 100644 --- a/security/apparmor/capability.c +++ b/security/apparmor/capability.c | |||
@@ -27,6 +27,11 @@ | |||
27 | */ | 27 | */ |
28 | #include "capability_names.h" | 28 | #include "capability_names.h" |
29 | 29 | ||
30 | struct aa_fs_entry aa_fs_entry_caps[] = { | ||
31 | AA_FS_FILE_STRING("mask", AA_FS_CAPS_MASK), | ||
32 | { } | ||
33 | }; | ||
34 | |||
30 | struct audit_cache { | 35 | struct audit_cache { |
31 | struct aa_profile *profile; | 36 | struct aa_profile *profile; |
32 | kernel_cap_t caps; | 37 | kernel_cap_t caps; |