diff options
| author | John Johansen <john.johansen@canonical.com> | 2022-09-05 20:47:36 -0700 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2022-10-03 14:49:04 -0700 |
| commit | 1ad22fcc4d0d2fb2e0f35aed555a86d016d5e590 (patch) | |
| tree | 5cf7b9f785d46441d3c184a3097659eb7c2574ac /security/apparmor/capability.c | |
| parent | 217af7e2f4deb629aaa49622685ccfee923898ca (diff) | |
| download | linux-stable-1ad22fcc4d0d2fb2e0f35aed555a86d016d5e590.tar.gz linux-stable-1ad22fcc4d0d2fb2e0f35aed555a86d016d5e590.tar.bz2 linux-stable-1ad22fcc4d0d2fb2e0f35aed555a86d016d5e590.zip | |
apparmor: rework profile->rules to be a list
Convert profile->rules to a list as the next step towards supporting
multiple rulesets in a profile. For this step only support a single
list entry item. The logic for iterating the list will come as a
separate step.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/capability.c')
| -rw-r--r-- | security/apparmor/capability.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/apparmor/capability.c b/security/apparmor/capability.c index b66ec63e2a48..326a51838ef2 100644 --- a/security/apparmor/capability.c +++ b/security/apparmor/capability.c @@ -64,7 +64,8 @@ static void audit_cb(struct audit_buffer *ab, void *va) static int audit_caps(struct common_audit_data *sa, struct aa_profile *profile, int cap, int error) { - struct aa_ruleset *rules = &profile->rules; + struct aa_ruleset *rules = list_first_entry(&profile->rules, + typeof(*rules), list); struct audit_cache *ent; int type = AUDIT_APPARMOR_AUTO; @@ -115,7 +116,8 @@ static int audit_caps(struct common_audit_data *sa, struct aa_profile *profile, static int profile_capable(struct aa_profile *profile, int cap, unsigned int opts, struct common_audit_data *sa) { - struct aa_ruleset *rules = &profile->rules; + struct aa_ruleset *rules = list_first_entry(&profile->rules, + typeof(*rules), list); int error; if (cap_raised(rules->caps.allow, cap) && |