Commit 724e7bfc authored Mar 11, 2015 by Pranith Kumar Committed by Paul Moore Mar 13, 2015

audit: Remove condition which always evaluates to false



After commit 3e1d0bb6 ("audit: Convert int limit
uses to u32"), by converting an int to u32, few conditions will always evaluate
to false.

These warnings were emitted during compilation:

kernel/audit.c: In function ‘audit_set_enabled’:
kernel/audit.c:347:2: warning: comparison of unsigned expression < 0 is always
false [-Wtype-limits]
  if (state < AUDIT_OFF || state > AUDIT_LOCKED)
	  ^
	  kernel/audit.c: In function ‘audit_receive_msg’:
	  kernel/audit.c:880:9: warning: comparison of unsigned expression < 0 is
	  always false [-Wtype-limits]
	      if (s.backlog_wait_time < 0 ||

The following patch removes those unnecessary conditions.

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>

parent 5b282552

kernel/audit.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -346,7 +346,7 @@ static int audit_set_backlog_wait_time(u32 timeout)
		static int audit_set_enabled(u32 state)
		{
		int rc;
		if (state < AUDIT_OFF \|\| state > AUDIT_LOCKED)
		if (state > AUDIT_LOCKED)
		return -EINVAL;

		rc = audit_do_config_change("audit_enabled", &audit_enabled, state);
		@@ -888,8 +888,7 @@ static int audit_receive_msg(struct sk_buff skb, struct nlmsghdr nlh)
		if (s.mask & AUDIT_STATUS_BACKLOG_WAIT_TIME) {
		if (sizeof(s) > (size_t)nlh->nlmsg_len)
		return -EINVAL;
		if (s.backlog_wait_time < 0 \|\|
		s.backlog_wait_time > 10*AUDIT_BACKLOG_WAIT_TIME)
		if (s.backlog_wait_time > 10*AUDIT_BACKLOG_WAIT_TIME)
		return -EINVAL;
		err = audit_set_backlog_wait_time(s.backlog_wait_time);
		if (err < 0)

Admin message