aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhong jiang <zhongjiang@huawei.com>2018-09-20 17:37:46 +0800
committerDavid S. Miller <davem@davemloft.net>2018-09-21 09:04:37 -0700
commitf2a2f2166af8df04cf87127b6c63f1f4c64a8430 (patch)
tree72edf8b43e279cfb5e7080730ed788d82f9fa126
parentnet: cxgb3_main: remove redundant null pointer check before kfree_skb (diff)
downloadlinux-dev-f2a2f2166af8df04cf87127b6c63f1f4c64a8430.tar.xz
linux-dev-f2a2f2166af8df04cf87127b6c63f1f4c64a8430.zip
ipv6: remove redundant null pointer check before kfree_skb
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>
-rw-r--r--net/ipv6/af_inet6.c6
1 files changed, 2 insertions, 4 deletions
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);