Commit 144a6adf authored by zhong jiang's avatar zhong jiang Committed by David S. Miller

net: tap: 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: default avatarzhong jiang <zhongjiang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68c38507
...@@ -830,8 +830,7 @@ static ssize_t tap_do_read(struct tap_queue *q, ...@@ -830,8 +830,7 @@ static ssize_t tap_do_read(struct tap_queue *q,
ssize_t ret = 0; ssize_t ret = 0;
if (!iov_iter_count(to)) { if (!iov_iter_count(to)) {
if (skb) kfree_skb(skb);
kfree_skb(skb);
return 0; return 0;
} }
...@@ -1236,8 +1235,7 @@ static int tap_recvmsg(struct socket *sock, struct msghdr *m, ...@@ -1236,8 +1235,7 @@ static int tap_recvmsg(struct socket *sock, struct msghdr *m,
struct sk_buff *skb = m->msg_control; struct sk_buff *skb = m->msg_control;
int ret; int ret;
if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) { if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) {
if (skb) kfree_skb(skb);
kfree_skb(skb);
return -EINVAL; return -EINVAL;
} }
ret = tap_do_read(q, &m->msg_iter, flags & MSG_DONTWAIT, skb); ret = tap_do_read(q, &m->msg_iter, flags & MSG_DONTWAIT, skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment