diff options
| author | Sergey Nazarov <s-nazarov@yandex.ru> | 2021-06-08 09:32:06 +0300 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2021-06-08 22:05:24 -0400 |
| commit | 619ed58ac4e2fbed71ac05f664a4a17e32537176 (patch) | |
| tree | 284e66e9f6da7db0cec7958bd847178b5687f968 /kernel/audit.h | |
| parent | 254c8b96c4af02a09004d605c7f2dfad7f1cb5ca (diff) | |
| download | lwn-619ed58ac4e2fbed71ac05f664a4a17e32537176.tar.gz lwn-619ed58ac4e2fbed71ac05f664a4a17e32537176.zip | |
audit: Rename enum audit_state constants to avoid AUDIT_DISABLED redefinition
AUDIT_DISABLED defined in kernel/audit.h as element of enum audit_state
and redefined in kernel/audit.c. This produces a warning when kernel builds
with syscalls audit disabled and brokes kernel build if -Werror used.
enum audit_state used in syscall audit code only. This patch changes
enum audit_state constants prefix AUDIT to AUDIT_STATE to avoid
AUDIT_DISABLED redefinition.
Signed-off-by: Sergey Nazarov <s-nazarov@yandex.ru>
Acked-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'kernel/audit.h')
| -rw-r--r-- | kernel/audit.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/audit.h b/kernel/audit.h index 1522e100fd17..e518ad9374fc 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -21,16 +21,16 @@ a per-task filter. At syscall entry, the audit_state is augmented by the syscall filter. */ enum audit_state { - AUDIT_DISABLED, /* Do not create per-task audit_context. + AUDIT_STATE_DISABLED, /* Do not create per-task audit_context. * No syscall-specific audit records can * be generated. */ - AUDIT_BUILD_CONTEXT, /* Create the per-task audit_context, + AUDIT_STATE_BUILD, /* Create the per-task audit_context, * and fill it in at syscall * entry time. This makes a full * syscall record available if some * other part of the kernel decides it * should be recorded. */ - AUDIT_RECORD_CONTEXT /* Create the per-task audit_context, + AUDIT_STATE_RECORD /* Create the per-task audit_context, * always fill it in at syscall entry * time, and always write out the audit * record at syscall exit time. */ @@ -322,7 +322,7 @@ static inline int audit_signal_info_syscall(struct task_struct *t) return 0; } -#define audit_filter_inodes(t, c) AUDIT_DISABLED +#define audit_filter_inodes(t, c) AUDIT_STATE_DISABLED #endif /* CONFIG_AUDITSYSCALL */ extern char *audit_unpack_string(void **bufp, size_t *remain, size_t len); |