diff options
| author |  Richard Guy Briggs <rgb@redhat.com>
| 2018-06-05 19:20:39 -0400 |
|---|---|---|
| committer |  Paul Moore <paul@paul-moore.com>
| 2018-06-19 10:43:55 -0400 |
| commit | f7859590d97614815b35a755c8213dfb8f2766bd (patch) | |
| tree | 94bb23b92b5ce6c2f24fb5acc187a1bbd8318c5f /include | |
| parent | audit: rename FILTER_TYPE to FILTER_EXCLUDE (diff) | |
| download | linux-f7859590d97614815b35a755c8213dfb8f2766bd.tar.gz linux-f7859590d97614815b35a755c8213dfb8f2766bd.tar.bz2 linux-f7859590d97614815b35a755c8213dfb8f2766bd.zip | |
audit: eliminate audit_enabled magic number comparison
Remove comparison of audit_enabled to magic numbers outside of audit.
Related: https://github.com/linux-audit/audit-kernel/issues/86
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/audit.h | 5 | ||||
| -rw-r--r-- | include/net/xfrm.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 69c78477590b..9334fbef7bae 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -117,6 +117,9 @@ struct filename; extern void audit_log_session_info(struct audit_buffer *ab); +#define AUDIT_OFF 0 +#define AUDIT_ON 1 +#define AUDIT_LOCKED 2 #ifdef CONFIG_AUDIT /* These are defined in audit.c */ /* Public API */ @@ -202,7 +205,7 @@ static inline int audit_log_task_context(struct audit_buffer *ab) static inline void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk) { } -#define audit_enabled 0 +#define audit_enabled AUDIT_OFF #endif /* CONFIG_AUDIT */ #ifdef CONFIG_AUDIT_COMPAT_GENERIC diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 557122846e0e..f7f297727ed8 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -735,7 +735,7 @@ static inline struct audit_buffer *xfrm_audit_start(const char *op) { struct audit_buffer *audit_buf = NULL; - if (audit_enabled == 0) + if (audit_enabled == AUDIT_OFF) return NULL; audit_buf = audit_log_start(audit_context(), GFP_ATOMIC, AUDIT_MAC_IPSEC_EVENT); |