Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

audit: eliminate audit_enabled magic number comparison

Browse Source 
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>
This commit is contained in:
Richard Guy Briggs 2018-06-05 19:20:39 -04:00 committed by Paul Moore
parent d904ac0320
commit f7859590d9
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tty/tty_audit.c
View File

@ -92,7 +92,7 @@ static void tty_audit_buf_push(struct tty_audit_buf *buf)
{ {
if (buf->valid == 0) if (buf->valid == 0)
return; return;
if (audit_enabled == 0) { if (audit_enabled == AUDIT_OFF) {
buf->valid = 0; buf->valid = 0;
return; return;
} }

5
include/linux/audit.h
View File

@ -117,6 +117,9 @@ struct filename;
extern void audit_log_session_info(struct audit_buffer *ab); 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 #ifdef CONFIG_AUDIT
/* These are defined in audit.c */ /* These are defined in audit.c */
/* Public API */ /* 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, static inline void audit_log_task_info(struct audit_buffer *ab,
struct task_struct *tsk) struct task_struct *tsk)
{ } { }
#define audit_enabled 0 #define audit_enabled AUDIT_OFF
#endif /* CONFIG_AUDIT */ #endif /* CONFIG_AUDIT */
#ifdef CONFIG_AUDIT_COMPAT_GENERIC #ifdef CONFIG_AUDIT_COMPAT_GENERIC

2
include/net/xfrm.h
View File

@ -735,7 +735,7 @@ static inline struct audit_buffer *xfrm_audit_start(const char *op)
{ {
struct audit_buffer *audit_buf = NULL; struct audit_buffer *audit_buf = NULL;
if (audit_enabled == 0) if (audit_enabled == AUDIT_OFF)
return NULL; return NULL;
audit_buf = audit_log_start(audit_context(), GFP_ATOMIC, audit_buf = audit_log_start(audit_context(), GFP_ATOMIC,
AUDIT_MAC_IPSEC_EVENT); AUDIT_MAC_IPSEC_EVENT);

3
kernel/audit.c
View File

@ -83,9 +83,6 @@
#define AUDIT_INITIALIZED 1 #define AUDIT_INITIALIZED 1
static int audit_initialized; static int audit_initialized;
#define AUDIT_OFF 0
#define AUDIT_ON 1
#define AUDIT_LOCKED 2
u32 audit_enabled = AUDIT_OFF; u32 audit_enabled = AUDIT_OFF;
bool audit_ever_enabled = !!AUDIT_OFF; bool audit_ever_enabled = !!AUDIT_OFF;

2
net/netfilter/xt_AUDIT.c
View File

@ -72,7 +72,7 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par)
struct audit_buffer *ab; struct audit_buffer *ab;
int fam = -1; int fam = -1;
if (audit_enabled == 0) if (audit_enabled == AUDIT_OFF)
goto errout; goto errout;
ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT); ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT);
if (ab == NULL) if (ab == NULL)

2
net/netlabel/netlabel_user.c
View File

@ -101,7 +101,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,
char *secctx; char *secctx;
u32 secctx_len; u32 secctx_len;
if (audit_enabled == 0) if (audit_enabled == AUDIT_OFF)
return NULL; return NULL;
audit_buf = audit_log_start(audit_context(), GFP_ATOMIC, type); audit_buf = audit_log_start(audit_context(), GFP_ATOMIC, type);