From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sun, 15 Nov 2015 12:38:33 +0100

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 <elfr...@users.sourceforge.net>
---
 kernel/audit.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 5ffcbd3..1e8e228 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -509,8 +509,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);
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to