diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-16 05:23:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-16 05:23:23 +0200 |
| commit | 463910e2dff580e4e9a678af710b4818b5189691 (patch) | |
| tree | 21b4e53cdbec7e5a537ddfc1598fbf17deae57e2 /net/ipv6/tcp_ipv6.c | |
| parent | dt-bindings: net: ravb : Add support for r8a7745 SoC (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-463910e2dff580e4e9a678af710b4818b5189691.tar.xz linux-463910e2dff580e4e9a678af710b4818b5189691.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index f776ec4ecf6d..d79a1af3252e 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1458,6 +1458,8 @@ process: } sock_hold(sk); refcounted = true; + if (tcp_filter(sk, skb)) + goto discard_and_relse; nsk = tcp_check_req(sk, skb, req, false); if (!nsk) { reqsk_put(req); @@ -1466,8 +1468,6 @@ process: if (nsk == sk) { reqsk_put(req); tcp_v6_restore_cb(skb); - } else if (tcp_filter(sk, skb)) { - goto discard_and_relse; } else if (tcp_child_process(sk, nsk, skb)) { tcp_v6_send_reset(nsk, skb); goto discard_and_relse; |