aboutsummaryrefslogtreecommitdiff
path: root/security/apparmor/audit.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2022-09-19 00:46:09 -0700
committerJohn Johansen <john.johansen@canonical.com>2023-10-18 15:30:34 -0700
commitd20f5a1a6e792d22199c9989ec7ab9e95c48d60c (patch)
tree391acb688c0a3956f455dddc1d3a1a5e2b190daa /security/apparmor/audit.c
parentbd7bd201ca46c211c3ab251ca9854787d1331a2f (diff)
apparmor: rename audit_data->label to audit_data->subj_label
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>
Diffstat (limited to 'security/apparmor/audit.c')
-rw-r--r--security/apparmor/audit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 06ad6a8fcce1..6933cb2f679b 100644
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -113,8 +113,8 @@ static void audit_pre(struct audit_buffer *ab, void *va)
audit_log_format(ab, " error=%d", ad->error);
}
- if (ad->label) {
- struct aa_label *label = ad->label;
+ if (ad->subj_label) {
+ struct aa_label *label = ad->subj_label;
if (label_isprofile(label)) {
struct aa_profile *profile = labels_profile(label);
@@ -187,7 +187,7 @@ int aa_audit(int type, struct aa_profile *profile,
if (KILL_MODE(profile) && type == AUDIT_APPARMOR_DENIED)
type = AUDIT_APPARMOR_KILL;
- ad->label = &profile->label;
+ ad->subj_label = &profile->label;
aa_audit_msg(type, ad, cb);