From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA818C33C9E for ; Tue, 7 Jan 2020 20:58:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B2D7208C4 for ; Tue, 7 Jan 2020 20:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578430711; bh=X/6xvICbw8hI0o2RYXjRcQM+iteqfLO9+pizoBcrLNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TpSIqB9BPo+cLKBNS/BEpHrCNg8dget1Vxve7ZM9CipipqwtLYr7W3iOLeONaFH8m 2Lmg8OCC+by7iojfDf08Xn1F3fa0iXPmgQiPPQOHz1k7ZPfWKbCt3rDFyFfcJ3I1Lf +KcTR9/lMOClIy3W8jRlTxBz2enVIP5KM2x89cHk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727299AbgAGU63 (ORCPT ); Tue, 7 Jan 2020 15:58:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:57732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727884AbgAGU62 (ORCPT ); Tue, 7 Jan 2020 15:58:28 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 90E1B208C4; Tue, 7 Jan 2020 20:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578430708; bh=X/6xvICbw8hI0o2RYXjRcQM+iteqfLO9+pizoBcrLNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c6qF07BYK1UKf5afeqixTZ4eyQ1+CkEHTLH2md63V/eK1piUL/zGoYmhosQka03dx +MmtJ6zxslm5qxeYLiV3di5dTfGMPMYOLlGcS7Gf0C8YB0WwAx3eWYc9EPOhQ6/7U+ nFxK6MRjKAONptj45EUWG+K3ukNc5b1axsYyaOQg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Sutter , Florian Westphal , =?UTF-8?q?M=C3=A1t=C3=A9=20Eckl?= , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.4 063/191] netfilter: nft_tproxy: Fix port selector on Big Endian Date: Tue, 7 Jan 2020 21:53:03 +0100 Message-Id: <20200107205336.364946007@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107205332.984228665@linuxfoundation.org> References: <20200107205332.984228665@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Phil Sutter [ 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 Acked-by: Florian Westphal Acked-by: Máté Eckl Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- 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(®s->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(®s->data[priv->sreg_port]); if (!tport) tport = hp->dest; -- 2.20.1