Commit cb84aa9b42b506299e5aea1ba4da26c03ab12877

Authored by Eric Paris
Committed by James Morris
1 parent b03df87d11

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>

Showing 3 changed files with 3 additions and 4 deletions Side-by-side Diff

include/linux/lsm_audit.h
... ... @@ -33,7 +33,7 @@
33 33 #define LSM_AUDIT_DATA_IPC 4
34 34 #define LSM_AUDIT_DATA_TASK 5
35 35 #define LSM_AUDIT_DATA_KEY 6
36   -#define LSM_AUDIT_NO_AUDIT 7
  36 +#define LSM_AUDIT_DATA_NONE 7
37 37 #define LSM_AUDIT_DATA_KMOD 8
38 38 struct task_struct *tsk;
39 39 union {
security/lsm_audit.c
... ... @@ -220,7 +220,7 @@
220 220 }
221 221  
222 222 switch (a->type) {
223   - case LSM_AUDIT_NO_AUDIT:
  223 + case LSM_AUDIT_DATA_NONE:
224 224 return;
225 225 case LSM_AUDIT_DATA_IPC:
226 226 audit_log_format(ab, " key=%d ", a->u.ipc_id);
security/selinux/avc.c
... ... @@ -499,8 +499,7 @@
499 499 return;
500 500 if (!a) {
501 501 a = &stack_data;
502   - memset(a, 0, sizeof(*a));
503   - a->type = LSM_AUDIT_NO_AUDIT;
  502 + COMMON_AUDIT_DATA_INIT(a, NONE);
504 503 }
505 504 a->selinux_audit_data.tclass = tclass;
506 505 a->selinux_audit_data.requested = requested;