Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 384abed1 authored by Chenbo Feng's avatar Chenbo Feng Committed by David S. Miller
Browse files

bpf: Remove duplicate tcp_filter hook in ipv6 



There are two tcp_filter hooks in tcp_ipv6 ingress path currently.
One is at tcp_v6_rcv and another is in tcp_v6_do_rcv. It seems the
tcp_filter() call inside tcp_v6_do_rcv is redundent and some packet
will be filtered twice in this situation. This will cause trouble
when using eBPF filters to account traffic data.

Signed-off-by: default avatarChenbo Feng <fengc@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd99c377

net/ipv6/tcp_ipv6.c

+0 −3
Original line number Diff line number Diff line
@@ -1249,9 +1249,6 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	if (skb->protocol == htons(ETH_P_IP))

		return tcp_v4_do_rcv(sk, skb);



	if (tcp_filter(sk, skb))

		goto discard;



	/*

	 *	socket locking is here for SMP purposes as backlog rcv

	 *	is currently called with bh processing disabled.