summaryrefslogtreecommitdiffstats
path: root/security/apparmor/task.c
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2022-09-19 09:46:09 +0200
committerJohn Johansen <john.johansen@canonical.com>2023-10-19 00:30:34 +0200
commitd20f5a1a6e792d22199c9989ec7ab9e95c48d60c (patch)
tree391acb688c0a3956f455dddc1d3a1a5e2b190daa /security/apparmor/task.c
parentapparmor: combine common_audit_data and apparmor_audit_data (diff)
downloadlinux-d20f5a1a6e792d22199c9989ec7ab9e95c48d60c.tar.xz
linux-d20f5a1a6e792d22199c9989ec7ab9e95c48d60c.zip
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/task.c')
-rw-r--r--security/apparmor/task.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/task.c b/security/apparmor/task.c
index b2a777ed14d8..552442844ff8 100644
--- a/security/apparmor/task.c
+++ b/security/apparmor/task.c
@@ -217,7 +217,7 @@ static void audit_ptrace_cb(struct audit_buffer *ab, void *va)
}
}
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);
}
@@ -263,7 +263,7 @@ static int profile_tracer_perm(struct aa_profile *tracer,
if (&tracer->label == tracee)
return 0;
- ad->label = &tracer->label;
+ ad->subj_label = &tracer->label;
ad->peer = tracee;
ad->request = 0;
ad->error = aa_capable(&tracer->label, CAP_SYS_PTRACE,