mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

bpf: remove redundant null pointer check before consume_skb

Browse source 
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:
zhong jiang 2018-09-20 17:46:12 +08:00 committed by Daniel Borkmann
parent 32c0097983
commit 788758d1fe
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/bpf/sockmap.c
View file

@ -590,8 +590,7 @@ static int free_sg(struct sock *sk, int start,
if (i == MAX_SKB_FRAGS) if (i == MAX_SKB_FRAGS)
i = 0; i = 0;
} }
if (md->skb) consume_skb(md->skb);
consume_skb(md->skb);
return free; 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) { if (!sg->length && md->sg_start == md->sg_end) {
list_del(&md->list); list_del(&md->list);
if (md->skb) consume_skb(md->skb);
consume_skb(md->skb);
kfree(md); kfree(md);
} }
} }