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

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
...@@ -33,7 +33,7 @@ struct common_audit_data { ...@@ -33,7 +33,7 @@ struct common_audit_data {
#define LSM_AUDIT_DATA_IPC 4 #define LSM_AUDIT_DATA_IPC 4
#define LSM_AUDIT_DATA_TASK 5 #define LSM_AUDIT_DATA_TASK 5
#define LSM_AUDIT_DATA_KEY 6 #define LSM_AUDIT_DATA_KEY 6
#define LSM_AUDIT_NO_AUDIT 7 #define LSM_AUDIT_DATA_NONE 7
#define LSM_AUDIT_DATA_KMOD 8 #define LSM_AUDIT_DATA_KMOD 8
struct task_struct *tsk; struct task_struct *tsk;
union { union {
......
...@@ -220,7 +220,7 @@ static void dump_common_audit_data(struct audit_buffer *ab, ...@@ -220,7 +220,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
} }
switch (a->type) { switch (a->type) {
case LSM_AUDIT_NO_AUDIT: case LSM_AUDIT_DATA_NONE:
return; return;
case LSM_AUDIT_DATA_IPC: case LSM_AUDIT_DATA_IPC:
audit_log_format(ab, " key=%d ", a->u.ipc_id); audit_log_format(ab, " key=%d ", a->u.ipc_id);
......
...@@ -499,8 +499,7 @@ void avc_audit(u32 ssid, u32 tsid, ...@@ -499,8 +499,7 @@ void avc_audit(u32 ssid, u32 tsid,
return; return;
if (!a) { if (!a) {
a = &stack_data; a = &stack_data;
memset(a, 0, sizeof(*a)); COMMON_AUDIT_DATA_INIT(a, NONE);
a->type = LSM_AUDIT_NO_AUDIT;
} }
a->selinux_audit_data.tclass = tclass; a->selinux_audit_data.tclass = tclass;
a->selinux_audit_data.requested = requested; a->selinux_audit_data.requested = requested;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment