This is a note to let you know that I've just added the patch titled
apparmor: rename audit_data->label to audit_data->subj_label
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
apparmor-rename-audit_data-label-to-audit_data-subj_.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 1df12c1710f6af2f580f6cffecd20d981358a372
Author: John Johansen <john.johansen@xxxxxxxxxxxxx>
Date: Mon Sep 19 00:46:09 2022 -0700
apparmor: rename audit_data->label to audit_data->subj_label
[ Upstream commit d20f5a1a6e792d22199c9989ec7ab9e95c48d60c ]
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@xxxxxxxxxxxxx>
Signed-off-by: John Johansen <john.johansen@xxxxxxxxxxxxx>
Stable-dep-of: 157a3537d6bc ("apparmor: Fix regression in mount mediation")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 06ad6a8fcce18..6933cb2f679b0 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);
diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index 9ea95fa18e7d5..5bfa70a972071 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -67,7 +67,7 @@ static void file_audit_cb(struct audit_buffer *ab, void *va)
if (ad->peer) {
audit_log_format(ab, " target=");
- aa_label_xaudit(ab, labels_ns(ad->label), ad->peer,
+ aa_label_xaudit(ab, labels_ns(ad->subj_label), ad->peer,
FLAG_VIEW_SUBNS, GFP_KERNEL);
} else if (ad->fs.target) {
audit_log_format(ab, " target=");
diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
index 85931ec94e916..096f0a04af87f 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
@@ -109,7 +109,7 @@ struct apparmor_audit_data {
int type;
u16 class;
const char *op;
- struct aa_label *label;
+ struct aa_label *subj_label;
const char *name;
const char *info;
u32 request;
diff --git a/security/apparmor/ipc.c b/security/apparmor/ipc.c
index f198b8d620a4f..fd8306399b820 100644
--- a/security/apparmor/ipc.c
+++ b/security/apparmor/ipc.c
@@ -71,7 +71,7 @@ static void audit_signal_cb(struct audit_buffer *ab, void *va)
audit_log_format(ab, " signal=rtmin+%d",
ad->signal - SIGRT_BASE);
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);
}
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index d6b2750fd72e4..c87bccafff446 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -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;
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index fd7852a4737c7..359fbfbb4a66e 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -722,11 +722,11 @@ static int apparmor_setprocattr(const char *name, void *value,
return error;
fail:
- ad.label = begin_current_label_crit_section();
+ ad.subj_label = begin_current_label_crit_section();
ad.info = name;
ad.error = error = -EINVAL;
aa_audit_msg(AUDIT_APPARMOR_DENIED, &ad, NULL);
- end_current_label_crit_section(ad.label);
+ end_current_label_crit_section(ad.subj_label);
goto out;
}
diff --git a/security/apparmor/net.c b/security/apparmor/net.c
index 0c7304cd479c5..5e50f80e35db0 100644
--- a/security/apparmor/net.c
+++ b/security/apparmor/net.c
@@ -100,7 +100,7 @@ void audit_net_cb(struct audit_buffer *ab, void *va)
}
if (ad->peer) {
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);
}
}
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 9a7dbe64f102b..e5f1ef83b0fda 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -733,7 +733,7 @@ static void audit_cb(struct audit_buffer *ab, void *va)
/**
* audit_policy - Do auditing of policy changes
- * @label: label to check if it can manage policy
+ * @subj_label: label to check if it can manage policy
* @op: policy operation being performed
* @ns_name: name of namespace being manipulated
* @name: name of profile being manipulated (NOT NULL)
@@ -742,7 +742,7 @@ static void audit_cb(struct audit_buffer *ab, void *va)
*
* Returns: the error to be returned after audit is done
*/
-static int audit_policy(struct aa_label *label, const char *op,
+static int audit_policy(struct aa_label *subj_label, const char *op,
const char *ns_name, const char *name,
const char *info, int error)
{
@@ -752,7 +752,7 @@ static int audit_policy(struct aa_label *label, const char *op,
ad.name = name;
ad.info = info;
ad.error = error;
- ad.label = label;
+ ad.subj_label = subj_label;
aa_audit_msg(AUDIT_APPARMOR_STATUS, &ad, audit_cb);
diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c
index b6b5e1bfe9a26..73ba26c646a5e 100644
--- a/security/apparmor/resource.c
+++ b/security/apparmor/resource.c
@@ -36,7 +36,7 @@ static void audit_cb(struct audit_buffer *ab, void *va)
rlim_names[ad->rlim.rlim], ad->rlim.max);
if (ad->peer) {
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);
}
}
diff --git a/security/apparmor/task.c b/security/apparmor/task.c
index 8bd1f212215c4..79850e8321420 100644
--- a/security/apparmor/task.c
+++ b/security/apparmor/task.c
@@ -220,7 +220,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);
}
@@ -266,7 +266,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,
