net: tap: remove redundant null pointer check before kfree_skb
authorzhong jiang <zhongjiang@huawei.com>
Thu, 20 Sep 2018 09:37:41 +0000 (17:37 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Sep 2018 16:04:37 +0000 (09:04 -0700)
kfree_skb has taken the null pointer into account. hence it is safe
to remove the redundant null pointer check before kfree_skb.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tap.c

index a4ab4a7..f03004f 100644 (file)
@@ -830,8 +830,7 @@ static ssize_t tap_do_read(struct tap_queue *q,
        ssize_t ret = 0;
 
        if (!iov_iter_count(to)) {
-               if (skb)
-                       kfree_skb(skb);
+               kfree_skb(skb);
                return 0;
        }
 
@@ -1236,8 +1235,7 @@ static int tap_recvmsg(struct socket *sock, struct msghdr *m,
        struct sk_buff *skb = m->msg_control;
        int ret;
        if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) {
-               if (skb)
-                       kfree_skb(skb);
+               kfree_skb(skb);
                return -EINVAL;
        }
        ret = tap_do_read(q, &m->msg_iter, flags & MSG_DONTWAIT, skb);