summaryrefslogtreecommitdiffstats
path: root/security/apparmor/include
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2017-06-10 01:02:25 +0200
committerJohn Johansen <john.johansen@canonical.com>2017-06-11 02:11:43 +0200
commitaebd873e8d3e34757c9295eef074d1be229f5893 (patch)
treee4655a4726e7ce1ce878bbbccc80cf5fa5b33f22 /security/apparmor/include
parentapparmor: update aa_audit_file() to use labels (diff)
downloadlinux-aebd873e8d3e34757c9295eef074d1be229f5893.tar.xz
linux-aebd873e8d3e34757c9295eef074d1be229f5893.zip
apparmor: refactor path name lookup and permission checks around labels
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/include')
-rw-r--r--security/apparmor/include/file.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/security/apparmor/include/file.h b/security/apparmor/include/file.h
index 7c6026460272..8daad14c47fd 100644
--- a/security/apparmor/include/file.h
+++ b/security/apparmor/include/file.h
@@ -190,7 +190,10 @@ unsigned int aa_str_perms(struct aa_dfa *dfa, unsigned int start,
const char *name, struct path_cond *cond,
struct aa_perms *perms);
-int aa_path_perm(const char *op, struct aa_profile *profile,
+int __aa_path_perm(const char *op, struct aa_profile *profile,
+ const char *name, u32 request, struct path_cond *cond,
+ int flags, struct aa_perms *perms);
+int aa_path_perm(const char *op, struct aa_label *label,
const struct path *path, int flags, u32 request,
struct path_cond *cond);