apparmor: move perm defines into policy_unpack

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <sbeattie@ubuntu.com>

diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h
index bbbf56f..001c43a 100644 (file)
--- 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 329b1fd..ca48a7d 100644 (file)
--- 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)