diff options
| author | John Johansen <john.johansen@canonical.com> | 2013-02-19 01:09:34 +0100 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2013-04-28 09:37:04 +0200 |
| commit | 180a6f5965a49535a7704c07691a6d1209904971 (patch) | |
| tree | 4b42a5409ff148e338c9eb77e66ede55b8bbf633 | |
| parent | apparmor: misc cleanup of match (diff) | |
| download | linux-180a6f5965a49535a7704c07691a6d1209904971.tar.xz linux-180a6f5965a49535a7704c07691a6d1209904971.zip | |
apparmor: move perm defines into policy_unpack
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <sbeattie@ubuntu.com>
| -rw-r--r-- | security/apparmor/include/match.h | 2 | ||||
| -rw-r--r-- | security/apparmor/policy_unpack.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h index bbbf56f5ba78..001c43aa0406 100644 --- a/security/apparmor/include/match.h +++ b/security/apparmor/include/match.h @@ -20,8 +20,6 @@ #define DFA_NOMATCH 0 #define DFA_START 1 -#define DFA_VALID_PERM_MASK 0xffffffff -#define DFA_VALID_PERM2_MASK 0xffffffff /** * The format used for transition tables is based on the GNU flex table diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index 329b1fd30749..ca48a7d8d5b3 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -290,6 +290,9 @@ static int unpack_strdup(struct aa_ext *e, char **string, const char *name) return res; } +#define DFA_VALID_PERM_MASK 0xffffffff +#define DFA_VALID_PERM2_MASK 0xffffffff + /** * verify_accept - verify the accept tables of a dfa * @dfa: dfa to verify accept tables of (NOT NULL) |