bpf: Remove duplicate tcp_filter hook in ipv6
authorChenbo Feng <fengc@google.com>
Fri, 9 Jun 2017 19:17:37 +0000 (12:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 10 Jun 2017 20:08:02 +0000 (16:08 -0400)
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>
net/ipv6/tcp_ipv6.c

index 0840543fc245c95fe15bf1a58bd6b98b9a42e5fc..84ad50218255dd64109c9cf834a8cff46a8ae45f 100644 (file)
@@ -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.