Commit d20f5a1a authored by John Johansen's avatar John Johansen
Browse files

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: default avatarGeorgia Garcia <georgia.garcia@canonical.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent bd7bd201

security/apparmor/audit.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

security/apparmor/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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=");

security/apparmor/include/audit.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

security/apparmor/ipc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

security/apparmor/lib.c

+2 −3
Original line number Diff line number Diff line
@@ -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;