mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
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: zhong jiang <zhongjiang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
68c385079c
commit
144a6adfa1
1 changed files with 2 additions and 4 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue