From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pranith Kumar Subject: [PATCH] audit: Remove condition which always evaluates to false Date: Wed, 11 Mar 2015 14:08:19 -0400 Message-ID: <1426097299-30577-1-git-send-email-bobby.prani@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Paul Moore , Eric Paris , "moderated list:AUDIT SUBSYSTEM" , open list List-Id: linux-audit@redhat.com After commit 3e1d0bb6224f019893d1c498cc3327559d183674 ("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 =E2=80=98audit_set_enabled=E2=80=99: 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 =E2=80=98audit_receive_msg=E2=80=99: kernel/audit.c:880:9: warning: comparison of unsigned expression < 0= is always false [-Wtype-limits] if (s.backlog_wait_time < 0 || =20 The following patch removes those unnecessary conditions. Signed-off-by: Pranith Kumar --- kernel/audit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 72ab759..b1006cb 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -344,7 +344,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; =20 rc =3D audit_do_config_change("audit_enabled", &audit_enabled, state= ); @@ -877,8 +877,7 @@ static int audit_receive_msg(struct sk_buff *skb, s= truct 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 =3D audit_set_backlog_wait_time(s.backlog_wait_time); if (err < 0) --=20 1.9.1