diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-21 09:04:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-21 09:04:38 -0700 |
| commit | 1ba2a720da72b11435dbe278c6ab83aac75734e5 (patch) | |
| tree | 72edf8b43e279cfb5e7080730ed788d82f9fa126 /net | |
| parent | 68c385079cb3530f03e22e563885e6ddaa11a586 (diff) | |
| parent | f2a2f2166af8df04cf87127b6c63f1f4c64a8430 (diff) | |
Merge branch 'kfree_skb-NULL'
zhong jiang says:
====================
net: remove redundant null pointer check before kfree_skb
The issue is detected with the help of Coccinelle.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 3 | ||||
| -rw-r--r-- | net/ipv6/af_inet6.c | 6 | ||||
| -rw-r--r-- | net/nfc/nci/uart.c | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index da930b01a147..13f4d189e12b 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -260,8 +260,7 @@ out: spin_unlock(&qp->q.lock); out_rcu_unlock: rcu_read_unlock(); - if (head) - kfree_skb(head); + kfree_skb(head); ipq_put(qp); } diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 77ef8478234f..e9c8cfdf4b4c 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -468,12 +468,10 @@ void inet6_destroy_sock(struct sock *sk) /* Release rx options */ skb = xchg(&np->pktoptions, NULL); - if (skb) - kfree_skb(skb); + kfree_skb(skb); skb = xchg(&np->rxpmtu, NULL); - if (skb) - kfree_skb(skb); + kfree_skb(skb); /* Free flowlabels */ fl6_free_socklist(sk); diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c index a66f102c6c01..4503937915ad 100644 --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@ -192,10 +192,8 @@ static void nci_uart_tty_close(struct tty_struct *tty) if (!nu) return; - if (nu->tx_skb) - kfree_skb(nu->tx_skb); - if (nu->rx_skb) - kfree_skb(nu->rx_skb); + kfree_skb(nu->tx_skb); + kfree_skb(nu->rx_skb); skb_queue_purge(&nu->tx_q); |