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

Commit cb84aa9b authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE 



Most of the LSM common audit work uses LSM_AUDIT_DATA_* for the naming.
This was not so for LSM_AUDIT_NO_AUDIT which means the generic initializer
cannot be used.  This patch just renames the flag so the generic
initializer can be used.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent b03df87d

include/linux/lsm_audit.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct common_audit_data { 
#define LSM_AUDIT_DATA_IPC	4

#define LSM_AUDIT_DATA_TASK	5

#define LSM_AUDIT_DATA_KEY	6

#define LSM_AUDIT_NO_AUDIT	7

#define LSM_AUDIT_DATA_NONE	7

#define LSM_AUDIT_DATA_KMOD	8

	struct task_struct *tsk;

	union 	{

security/lsm_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void dump_common_audit_data(struct audit_buffer *ab, 
	}



	switch (a->type) {

	case LSM_AUDIT_NO_AUDIT:

	case LSM_AUDIT_DATA_NONE:

		return;

	case LSM_AUDIT_DATA_IPC:

		audit_log_format(ab, " key=%d ", a->u.ipc_id);

security/selinux/avc.c

+1 −2
Original line number Diff line number Diff line
@@ -499,8 +499,7 @@ void avc_audit(u32 ssid, u32 tsid, 
		return;

	if (!a) {

		a = &stack_data;

		memset(a, 0, sizeof(*a));

		a->type = LSM_AUDIT_NO_AUDIT;

		COMMON_AUDIT_DATA_INIT(a, NONE);

	}

	a->selinux_audit_data.tclass = tclass;

	a->selinux_audit_data.requested = requested;