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/policy.c | |
| 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/policy.c')
| -rw-r--r-- | security/apparmor/policy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index 4f0eadee78b..90641438302 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -93,7 +93,7 @@ /* root profile namespace */ struct aa_namespace *root_ns; -const char *profile_mode_names[] = { +const char *const profile_mode_names[] = { "enforce", "complain", "kill", @@ -749,6 +749,7 @@ static void free_profile(struct aa_profile *profile) aa_free_sid(profile->sid); aa_put_dfa(profile->xmatch); + aa_put_dfa(profile->policy.dfa); aa_put_profile(profile->replacedby); |