lkml.org 
[lkml]   [2020]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 041/115] netfilter: nft_tproxy: Fix port selector on Big Endian
    Date
    From: Phil Sutter <phil@nwl.cc>

    [ Upstream commit 8cb4ec44de42b99b92399b4d1daf3dc430ed0186 ]

    On Big Endian architectures, u16 port value was extracted from the wrong
    parts of u32 sreg_port, just like commit 10596608c4d62 ("netfilter:
    nf_tables: fix mismatch in big-endian system") describes.

    Fixes: 4ed8eb6570a49 ("netfilter: nf_tables: Add native tproxy support")
    Signed-off-by: Phil Sutter <phil@nwl.cc>
    Acked-by: Florian Westphal <fw@strlen.de>
    Acked-by: Máté Eckl <ecklm94@gmail.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nft_tproxy.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/netfilter/nft_tproxy.c b/net/netfilter/nft_tproxy.c
    index f92a82c73880..95980154ef02 100644
    --- a/net/netfilter/nft_tproxy.c
    +++ b/net/netfilter/nft_tproxy.c
    @@ -50,7 +50,7 @@ static void nft_tproxy_eval_v4(const struct nft_expr *expr,
    taddr = nf_tproxy_laddr4(skb, taddr, iph->daddr);

    if (priv->sreg_port)
    - tport = regs->data[priv->sreg_port];
    + tport = nft_reg_load16(&regs->data[priv->sreg_port]);
    if (!tport)
    tport = hp->dest;

    @@ -117,7 +117,7 @@ static void nft_tproxy_eval_v6(const struct nft_expr *expr,
    taddr = *nf_tproxy_laddr6(skb, &taddr, &iph->daddr);

    if (priv->sreg_port)
    - tport = regs->data[priv->sreg_port];
    + tport = nft_reg_load16(&regs->data[priv->sreg_port]);
    if (!tport)
    tport = hp->dest;

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-07 22:11    [W:4.249 / U:0.640 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site