summaryrefslogtreecommitdiffstats
path: root/security/apparmor/include/file.h
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-05-26 15:07:22 -0700
committerJohn Johansen <john.johansen@canonical.com>2017-06-09 05:59:22 -0700
commite53cfe6c7caa79ccdccce53e600dae522acb1c84 (patch)
tree7258a54f52ef5861269df3d60bbee5e232fb90df /security/apparmor/include/file.h
parentfc7e0b26b8d26e680bb2f252e9521385e0092e4c (diff)
downloadlinux-e53cfe6c7caa79ccdccce53e600dae522acb1c84.tar.bz2
apparmor: rework perm mapping to a slightly broader set
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/include/file.h')
-rw-r--r--security/apparmor/include/file.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/apparmor/include/file.h b/security/apparmor/include/file.h
index a75e4872053a..fb3642a94e3d 100644
--- a/security/apparmor/include/file.h
+++ b/security/apparmor/include/file.h
@@ -22,10 +22,11 @@
struct aa_profile;
struct path;
+#define mask_mode_t(X) (X & (MAY_EXEC | MAY_WRITE | MAY_READ | MAY_APPEND))
#define AA_AUDIT_FILE_MASK (MAY_READ | MAY_WRITE | MAY_EXEC | MAY_APPEND |\
AA_MAY_CREATE | AA_MAY_DELETE | \
- AA_MAY_META_READ | AA_MAY_META_WRITE | \
+ AA_MAY_GETATTR | AA_MAY_SETATTR | \
AA_MAY_CHMOD | AA_MAY_CHOWN | AA_MAY_LOCK | \
AA_EXEC_MMAP | AA_MAY_LINK)
@@ -37,7 +38,7 @@ struct path;
* ctx struct will expand in the future so we keep the struct.
*/
struct aa_file_ctx {
- u16 allow;
+ u32 allow;
};
/**