Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e3fb8a authored by John Johansen's avatar John Johansen
Browse files

apparmor: remove tsk field from the apparmor_audit_struct 



Now that aa_capabile no longer sets the task field it can be removed
and the lsm_audit version of the field can be used.

Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent dd0c6e86

security/apparmor/audit.c

+2 −8
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static const char *const aa_audit_type[] = { 
static void audit_pre(struct audit_buffer *ab, void *ca)

{

	struct common_audit_data *sa = ca;

	struct task_struct *tsk = sa->aad->tsk ? sa->aad->tsk : current;

	struct task_struct *tsk = sa->u.tsk ? sa->u.tsk : current;



	if (aa_g_audit_header) {

		audit_log_format(ab, "apparmor=");
@@ -149,12 +149,6 @@ static void audit_pre(struct audit_buffer *ab, void *ca) 
		audit_log_format(ab, " name=");

		audit_log_untrustedstring(ab, sa->aad->name);

	}



	if (sa->aad->tsk) {

		audit_log_format(ab, " pid=%d comm=", tsk->pid);

		audit_log_untrustedstring(ab, tsk->comm);

	}



}



/**
@@ -212,7 +206,7 @@ int aa_audit(int type, struct aa_profile *profile, gfp_t gfp, 


	if (sa->aad->type == AUDIT_APPARMOR_KILL)

		(void)send_sig_info(SIGKILL, NULL,

				    sa->aad->tsk ?  sa->aad->tsk : current);

				    sa->u.tsk ?  sa->u.tsk : current);



	if (sa->aad->type == AUDIT_APPARMOR_ALLOWED)

		return complain_error(sa->aad->error);