mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
apparmor: remove apply_modes_to_perms from label_match
The modes shouldn't be applied at the point of label match, it just results in them being applied multiple times. Instead they should be applied after which is already being done by all callers so it can just be dropped from label_match. Reviewed-by: Georgia Garcia <georgia.garcia@canonical.com> Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
@@ -1317,7 +1317,6 @@ next:
|
||||
goto fail;
|
||||
}
|
||||
*perms = *aa_lookup_perms(rules->policy, state);
|
||||
aa_apply_modes_to_perms(profile, perms);
|
||||
if ((perms->allow & request) != request)
|
||||
return -EACCES;
|
||||
|
||||
@@ -1370,7 +1369,6 @@ static int label_components_match(struct aa_profile *profile,
|
||||
|
||||
next:
|
||||
tmp = *aa_lookup_perms(rules->policy, state);
|
||||
aa_apply_modes_to_perms(profile, &tmp);
|
||||
aa_perms_accum(perms, &tmp);
|
||||
label_for_each_cont(i, label, tp) {
|
||||
if (!aa_ns_visible(profile->ns, tp->ns, subns))
|
||||
@@ -1379,7 +1377,6 @@ next:
|
||||
if (!state)
|
||||
goto fail;
|
||||
tmp = *aa_lookup_perms(rules->policy, state);
|
||||
aa_apply_modes_to_perms(profile, &tmp);
|
||||
aa_perms_accum(perms, &tmp);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user