]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
audit: remove redundant condition check in kauditd_thread()
authorYunfeng Ye <yeyunfeng@huawei.com>
Wed, 23 Oct 2019 13:27:34 +0000 (21:27 +0800)
committerPaul Moore <paul@paul-moore.com>
Fri, 25 Oct 2019 15:48:14 +0000 (11:48 -0400)
Warning is found by the code analysis tool:
  "the condition 'if(ac && rc < 0)' is redundant: ac"

The @ac variable has been checked before. It can't be a null pointer
here, so remove the redundant condition check.

Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
kernel/audit.c

index d75485aa25ff3f3faa704852e03ff509a47e9e8a..8e09f0f55b4b0f8a0b1b517e19463f8df0d8a6d2 100644 (file)
@@ -830,7 +830,7 @@ static int kauditd_thread(void *dummy)
                rc = kauditd_send_queue(sk, portid,
                                        &audit_hold_queue, UNICAST_RETRIES,
                                        NULL, kauditd_rehold_skb);
-               if (ac && rc < 0) {
+               if (rc < 0) {
                        sk = NULL;
                        auditd_reset(ac);
                        goto main_queue;
@@ -840,7 +840,7 @@ static int kauditd_thread(void *dummy)
                rc = kauditd_send_queue(sk, portid,
                                        &audit_retry_queue, UNICAST_RETRIES,
                                        NULL, kauditd_hold_skb);
-               if (ac && rc < 0) {
+               if (rc < 0) {
                        sk = NULL;
                        auditd_reset(ac);
                        goto main_queue;