Commit f7859590 authored by Richard Guy Briggs's avatar Richard Guy Briggs Committed by Paul Moore
Browse files

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: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent d904ac03

drivers/tty/tty_audit.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void tty_audit_buf_push(struct tty_audit_buf *buf) 
{

	if (buf->valid == 0)

		return;

	if (audit_enabled == 0) {

	if (audit_enabled == AUDIT_OFF) {

		buf->valid = 0;

		return;

	}

include/linux/audit.h

+4 −1
Original line number Diff line number Diff line
@@ -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

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

kernel/audit.c

+0 −3
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ 
#define AUDIT_INITIALIZED	1

static int	audit_initialized;



#define AUDIT_OFF	0

#define AUDIT_ON	1

#define AUDIT_LOCKED	2

u32		audit_enabled = AUDIT_OFF;

bool		audit_ever_enabled = !!AUDIT_OFF;

net/netfilter/xt_AUDIT.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par) 
	struct audit_buffer *ab;

	int fam = -1;



	if (audit_enabled == 0)

	if (audit_enabled == AUDIT_OFF)

		goto errout;

	ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT);

	if (ab == NULL)

CRA Git | Maintained and supported by SUSTech CRA and CCSE