diff options
| author |   James Morris <james.l.morris@oracle.com> | 2012-03-15 14:43:02 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-03-15 14:43:02 +1100 |
| commit | b01d3fb921df9baef1ecd13704f4b1e269b58b6b (patch) | |
| tree | 1ca714b40774cd56c0194abee5c6577b2ba6aad2 /security/apparmor/include/apparmor.h | |
| parent | TOMOYO: Return appropriate value to poll(). (diff) | |
| parent | AppArmor: add const qualifiers to string arrays (diff) | |
| download | linux-dev-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.tar.xz linux-dev-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.zip | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next
Diffstat (limited to 'security/apparmor/include/apparmor.h')
| -rw-r--r-- | security/apparmor/include/apparmor.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h index df3649560818..40aedd9f73ea 100644 --- a/security/apparmor/include/apparmor.h +++ b/security/apparmor/include/apparmor.h @@ -19,6 +19,19 @@ #include "match.h" +/* + * Class of mediation types in the AppArmor policy db + */ +#define AA_CLASS_ENTRY 0 +#define AA_CLASS_UNKNOWN 1 +#define AA_CLASS_FILE 2 +#define AA_CLASS_CAP 3 +#define AA_CLASS_NET 4 +#define AA_CLASS_RLIMITS 5 +#define AA_CLASS_DOMAIN 6 + +#define AA_CLASS_LAST AA_CLASS_DOMAIN + /* Control parameters settable through module/boot flags */ extern enum audit_mode aa_g_audit; extern bool aa_g_audit_header; @@ -81,7 +94,7 @@ static inline unsigned int aa_dfa_null_transition(struct aa_dfa *dfa, unsigned int start) { /* the null transition only needs the string's null terminator byte */ - return aa_dfa_match_len(dfa, start, "", 1); + return aa_dfa_next(dfa, start, 0); } static inline bool mediated_filesystem(struct inode *inode) |