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: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>

3 files changed, 3 insertions, 4 deletions

diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index f78f83d7663f..6907251d5200 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -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   {
diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index acba3dfc8d29..8c3650672e23 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -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);
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 989fef82563a..7f1a304712a9 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -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;