summaryrefslogtreecommitdiffstats
path: root/security/apparmor/lsm.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2022-07-30 02:17:31 +0200
committerJohn Johansen <john.johansen@canonical.com>2022-10-03 23:49:04 +0200
commit217af7e2f4deb629aaa49622685ccfee923898ca (patch)
tree02cec1dca247db53b3cd4acb711d2a77b512ab12 /security/apparmor/lsm.c
parentapparmor: verify loaded permission bits masks don't overlap (diff)
downloadlinux-217af7e2f4deb629aaa49622685ccfee923898ca.tar.xz
linux-217af7e2f4deb629aaa49622685ccfee923898ca.zip
apparmor: refactor profile rules and attachments
In preparation for moving from a single set of rules and a single attachment to multiple rulesets and attachments separate from the profile refactor attachment information and ruleset info into their own structures. Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/lsm.c')
-rw-r--r--security/apparmor/lsm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 784709286a62..62f2ca32b959 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -166,9 +166,9 @@ static int apparmor_capget(struct task_struct *target, kernel_cap_t *effective,
if (COMPLAIN_MODE(profile))
continue;
*effective = cap_intersect(*effective,
- profile->caps.allow);
+ profile->rules.caps.allow);
*permitted = cap_intersect(*permitted,
- profile->caps.allow);
+ profile->rules.caps.allow);
}
}
rcu_read_unlock();