diff options
| author | John Johansen <john.johansen@canonical.com> | 2012-02-16 06:20:26 -0800 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2012-03-14 06:15:24 -0700 |
| commit | 0fe1212d0539eb6c1e27d388711172d786e299cc (patch) | |
| tree | b6e653222f271f52b8d4606102ef1e6bd72b7bc2 /security/apparmor/include | |
| parent | 3372b68a3c982611dcc30b3c872f8bbdee019e5e (diff) | |
| download | op-kernel-dev-0fe1212d0539eb6c1e27d388711172d786e299cc.zip op-kernel-dev-0fe1212d0539eb6c1e27d388711172d786e299cc.tar.gz | |
AppArmor: Update dfa matching routines.
Update aa_dfa_match so that it doesn't result in an input string being
walked twice (once to get its length and another time to match)
Add a single step functions
aa_dfa_next
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <kees@ubuntu.com>
Diffstat (limited to 'security/apparmor/include')
| -rw-r--r-- | security/apparmor/include/apparmor.h | 2 | ||||
| -rw-r--r-- | security/apparmor/include/match.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h index df36495..248c408 100644 --- a/security/apparmor/include/apparmor.h +++ b/security/apparmor/include/apparmor.h @@ -81,7 +81,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) diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h index a4a8639..775843e 100644 --- a/security/apparmor/include/match.h +++ b/security/apparmor/include/match.h @@ -116,6 +116,9 @@ unsigned int aa_dfa_match_len(struct aa_dfa *dfa, unsigned int start, const char *str, int len); unsigned int aa_dfa_match(struct aa_dfa *dfa, unsigned int start, const char *str); +unsigned int aa_dfa_next(struct aa_dfa *dfa, unsigned int state, + const char c); + void aa_dfa_free_kref(struct kref *kref); /** |
