summaryrefslogtreecommitdiffstats
path: root/security/apparmor/policy.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2020-11-21 01:42:40 -0800
committerJohn Johansen <john.johansen@canonical.com>2022-10-03 14:49:03 -0700
commit048d49544455b3e3a535c4ec89057ea5ca8676f0 (patch)
tree3155403c8c735db60990c74125edf8947f0dd0b8 /security/apparmor/policy.c
parent53bdc46f4bdd20d477afb374767cabe627fd04ae (diff)
downloadlinux-stable-048d49544455b3e3a535c4ec89057ea5ca8676f0.tar.gz
linux-stable-048d49544455b3e3a535c4ec89057ea5ca8676f0.tar.bz2
linux-stable-048d49544455b3e3a535c4ec89057ea5ca8676f0.zip
apparmor: convert xmatch to using the new shared policydb struct
continue permission unification by converting xmatch to use the policydb struct that is used by the other profile dfas. Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/policy.c')
-rw-r--r--security/apparmor/policy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 0814ee57a06b..cdcf26c9bed5 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -230,8 +230,7 @@ void aa_free_profile(struct aa_profile *profile)
kfree_sensitive(profile->secmark[i].label);
kfree_sensitive(profile->secmark);
kfree_sensitive(profile->dirname);
- aa_put_dfa(profile->xmatch);
- kvfree(profile->xmatch_perms);
+ aa_destroy_policydb(&profile->xmatch);
aa_destroy_policydb(&profile->policy);
if (profile->data) {
rht = profile->data;