audit: Remove condition which always evaluates to false
PATCH 1/1 audit: Remove condition which always evaluates to false
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 ‘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.
--- kernel/audit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/audit.c +2 -3
@@ -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 ; rc =audit_do_config_change ("audit_enabled" , &audit_enabled, state);
@@ -877,8 +877,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 )
Signature · 1 line
1.9.1
Quoted 16 lines · Pranith Kumar
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 ‘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 ||
Quoted 6 lines
The following patch removes those unnecessary conditions.
Signed-off-by Pranith Kumar <[email protected]>--- kernel/audit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Applied, thanks!
Quoted 26 lines
kernel/audit.c +2
-4@@ -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 ; rc =audit_do_config_change ("audit_enabled" , &audit_enabled, state);@@ -877,8 +877,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 ) --1.9.1
Signature · 2 lines
paul moore www.paul-moore.com