Message ID | 25ca9c48-1ac9-daa1-8472-0a53e4beed6a@web.de |
---|---|
State | Rejected |
Delegated to: | BPF Maintainers |
Headers | show |
Series | net/ipv4/tcp_bpf: Delete an unnecessary check before the function call “consume_skb” | expand |
On Thu, Aug 22, 2019 at 10:19 AM Markus Elfring <Markus.Elfring@web.de> wrote: > > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Thu, 22 Aug 2019 18:20:42 +0200 > > The consume_skb() function performs also input parameter validation. > Thus the test around the call is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Acked-by: Song Liu <songliubraving@fb.com>
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 8a56e09cfb0e..4ae18bd431a0 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -103,8 +103,7 @@ int __tcp_bpf_recvmsg(struct sock *sk, struct sk_psock *psock, msg_rx->sg.start = i; if (!sge->length && msg_rx->sg.start == msg_rx->sg.end) { list_del(&msg_rx->list); - if (msg_rx->skb) - consume_skb(msg_rx->skb); + consume_skb(msg_rx->skb); kfree(msg_rx); } msg_rx = list_first_entry_or_null(&psock->ingress_msg,