lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 122/293] tcp: Add a tcp_filter hook before handle ack packet
    Date
    From: Chenbo Feng <fengc@google.com>

    [ Upstream commit 8fac365f63c866a00015fa13932d8ffc584518b8 ]

    Currently in both ipv4 and ipv6 code path, the ack packet received when
    sk at TCP_NEW_SYN_RECV state is not filtered by socket filter or cgroup
    filter since it is handled from tcp_child_process and never reaches the
    tcp_filter inside tcp_v4_rcv or tcp_v6_rcv. Adding a tcp_filter hooks
    here can make sure all the ingress tcp packet can be correctly filtered.

    Signed-off-by: Chenbo Feng <fengc@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    net/ipv4/tcp_ipv4.c | 2 ++
    net/ipv6/tcp_ipv6.c | 2 ++
    2 files changed, 4 insertions(+)

    diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
    index b3960738464e..7294a1106b75 100644
    --- a/net/ipv4/tcp_ipv4.c
    +++ b/net/ipv4/tcp_ipv4.c
    @@ -1677,6 +1677,8 @@ process:
    }
    if (nsk == sk) {
    reqsk_put(req);
    + } else if (tcp_filter(sk, skb)) {
    + goto discard_and_relse;
    } else if (tcp_child_process(sk, nsk, skb)) {
    tcp_v4_send_reset(nsk, skb);
    goto discard_and_relse;
    diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
    index eb624547382f..149b9b3cbd66 100644
    --- a/net/ipv6/tcp_ipv6.c
    +++ b/net/ipv6/tcp_ipv6.c
    @@ -1447,6 +1447,8 @@ 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;
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 04:21    [W:4.060 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site