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/policy.h | |
parent | 6041e8346f2165679c2184cab60db768d6a26a1d (diff) | |
parent | 2d4cee7e3a2b9f9c3237672cc136e20dbad0e2ce (diff) | |
download | linux-3.10-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.tar.gz linux-3.10-b01d3fb921df9baef1ecd13704f4b1e269b58b6b.tar.bz2 linux-3.10-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/policy.h')
-rw-r--r-- | security/apparmor/include/policy.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h index aeda5cf5690..bda4569fdd8 100644 --- a/security/apparmor/include/policy.h +++ b/security/apparmor/include/policy.h @@ -29,7 +29,7 @@ #include "file.h" #include "resource.h" -extern const char *profile_mode_names[]; +extern const char *const profile_mode_names[]; #define APPARMOR_NAMES_MAX_INDEX 3 #define COMPLAIN_MODE(_profile) \ @@ -129,6 +129,17 @@ struct aa_namespace { struct list_head sub_ns; }; +/* struct aa_policydb - match engine for a policy + * dfa: dfa pattern match + * start: set of start states for the different classes of data + */ +struct aa_policydb { + /* Generic policy DFA specific rule types will be subsections of it */ + struct aa_dfa *dfa; + unsigned int start[AA_CLASS_LAST + 1]; + +}; + /* struct aa_profile - basic confinement data * @base - base components of the profile (name, refcount, lists, lock ...) * @parent: parent of profile @@ -143,6 +154,7 @@ struct aa_namespace { * @flags: flags controlling profile behavior * @path_flags: flags controlling path generation behavior * @size: the memory consumed by this profiles rules + * @policy: general match rules governing policy * @file: The set of rules governing basic file access and domain transitions * @caps: capabilities for the profile * @rlimits: rlimits for the profile @@ -179,6 +191,7 @@ struct aa_profile { u32 path_flags; int size; + struct aa_policydb policy; struct aa_file_rules file; struct aa_caps caps; struct aa_rlimit rlimits; |