mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
bpf: remove redundant null pointer check before consume_skb
consume_skb has taken the null pointer into account. hence it is safe to remove the redundant null pointer check before consume_skb. Signed-off-by: zhong jiang <zhongjiang@huawei.com> Acked-by: Song Liu <songliubraving@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
parent
32c0097983
commit
788758d1fe
1 changed files with 2 additions and 4 deletions
|
@ -590,8 +590,7 @@ static int free_sg(struct sock *sk, int start,
|
|||
if (i == MAX_SKB_FRAGS)
|
||||
i = 0;
|
||||
}
|
||||
if (md->skb)
|
||||
consume_skb(md->skb);
|
||||
consume_skb(md->skb);
|
||||
|
||||
return free;
|
||||
}
|
||||
|
@ -973,8 +972,7 @@ static int bpf_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
|
|||
|
||||
if (!sg->length && md->sg_start == md->sg_end) {
|
||||
list_del(&md->list);
|
||||
if (md->skb)
|
||||
consume_skb(md->skb);
|
||||
consume_skb(md->skb);
|
||||
kfree(md);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue