OSDN Git Service

audit: Delete unnecessary checks before two function calls
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 13 Jan 2016 14:18:55 +0000 (09:18 -0500)
committerPaul Moore <paul@paul-moore.com>
Wed, 13 Jan 2016 14:18:55 +0000 (09:18 -0500)
The functions consume_skb() and kfree_skb() test whether their argument
is NULL and then return immediately.
Thus the tests around their calls are not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[PM: tweak patch prefix]
Signed-off-by: Paul Moore <pmoore@redhat.com>
kernel/audit.c

index d7b6757..d6dd95c 100644 (file)
@@ -508,8 +508,7 @@ static void flush_hold_queue(void)
         * if auditd just disappeared but we
         * dequeued an skb we need to drop ref
         */
-       if (skb)
-               consume_skb(skb);
+       consume_skb(skb);
 }
 
 static int kauditd_thread(void *dummy)
@@ -1232,9 +1231,7 @@ static void audit_buffer_free(struct audit_buffer *ab)
        if (!ab)
                return;
 
-       if (ab->skb)
-               kfree_skb(ab->skb);
-
+       kfree_skb(ab->skb);
        spin_lock_irqsave(&audit_freelist_lock, flags);
        if (audit_freelist_count > AUDIT_MAXFREE)
                kfree(ab);