lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 359/593] netfilter: nft_tproxy: restrict support to TCP and UDP transport protocols
    Date
    From: Pablo Neira Ayuso <pablo@netfilter.org>

    [ Upstream commit 52f0f4e178c757b3d356087376aad8bd77271828 ]

    Add unfront check for TCP and UDP packets before performing further
    processing.

    Fixes: 4ed8eb6570a4 ("netfilter: nf_tables: Add native tproxy support")
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nft_tproxy.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/net/netfilter/nft_tproxy.c b/net/netfilter/nft_tproxy.c
    index d67f83a0958d..242222dc52c3 100644
    --- a/net/netfilter/nft_tproxy.c
    +++ b/net/netfilter/nft_tproxy.c
    @@ -30,6 +30,12 @@ static void nft_tproxy_eval_v4(const struct nft_expr *expr,
    __be16 tport = 0;
    struct sock *sk;

    + if (pkt->tprot != IPPROTO_TCP &&
    + pkt->tprot != IPPROTO_UDP) {
    + regs->verdict.code = NFT_BREAK;
    + return;
    + }
    +
    hp = skb_header_pointer(skb, ip_hdrlen(skb), sizeof(_hdr), &_hdr);
    if (!hp) {
    regs->verdict.code = NFT_BREAK;
    @@ -91,7 +97,8 @@ static void nft_tproxy_eval_v6(const struct nft_expr *expr,

    memset(&taddr, 0, sizeof(taddr));

    - if (!pkt->tprot_set) {
    + if (pkt->tprot != IPPROTO_TCP &&
    + pkt->tprot != IPPROTO_UDP) {
    regs->verdict.code = NFT_BREAK;
    return;
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:01    [W:2.832 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site