raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-24 11:02:51 +00:00
Code Issues Projects Releases Wiki Activity

apparmor: rename audit_data->label to audit_data->subj_label

Browse Source 
rename audit_data's label field to subj_label to better reflect its
use. Also at the same time drop unneeded assignments to ->subj_label
as the later call to aa_check_perms will do the assignment if needed.

Reviewed-by: Georgia Garcia <georgia.garcia@canonical.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2022-09-19 00:46:09 -07:00
parent bd7bd201ca
commit d20f5a1a6e
10 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
security/apparmor/lib.c
View File

@@ -297,7 +297,7 @@ static void aa_audit_perms_cb(struct audit_buffer *ab, void *va)
PERMS_NAMES_MASK);
}
audit_log_format(ab, " peer=");
aa_label_xaudit(ab, labels_ns(ad->label), ad->peer,
aa_label_xaudit(ab, labels_ns(ad->subj_label), ad->peer,
FLAGS_NONE, GFP_ATOMIC);
}
@@ -357,7 +357,6 @@ int aa_profile_label_perm(struct aa_profile *profile, struct aa_profile *target,
typeof(*rules), list);
struct aa_perms perms;
ad->label = &profile->label;
ad->peer = &target->label;
ad->request = request;
@@ -419,7 +418,7 @@ int aa_check_perms(struct aa_profile *profile, struct aa_perms *perms,
}
if (ad) {
ad->label = &profile->label;
ad->subj_label = &profile->label;
ad->request = request;
ad->denied = denied;
ad->error = error;