Commit 384abed1 authored Jun 09, 2017 by Chenbo Feng Committed by David S. Miller Jun 10, 2017

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: Chenbo Feng <fengc@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David 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.

Admin message