From patchwork Tue Jan 7 20:54:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 234385 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 52DCDC282DD for ; Tue, 7 Jan 2020 21:05:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 203AE2081E for ; Tue, 7 Jan 2020 21:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578431127; bh=X/6xvICbw8hI0o2RYXjRcQM+iteqfLO9+pizoBcrLNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r9Ml+HsNe49Xr1da0MUIvGtvJbSuiXvk6xt4F1ozx3ag+U+2gScYeZxntCL3EVOf7 HLbZ+8xmAlqg1Teapluljeh4GiGlnN1FGYOrzMOQYQV7EDNiYyeUWL2Vsh6gIuvQMH MnUksCJOQtfihoqOjFbZtXT/Ae3Mk/zwTYElIQC0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728228AbgAGVFX (ORCPT ); Tue, 7 Jan 2020 16:05:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:51714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728530AbgAGVFW (ORCPT ); Tue, 7 Jan 2020 16:05:22 -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 2A3A620678; Tue, 7 Jan 2020 21:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578431121; bh=X/6xvICbw8hI0o2RYXjRcQM+iteqfLO9+pizoBcrLNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nemj3vooMIMPc6gVkWJBurGwAg8sHzbyPxHAVRx8hilTotuss1FWOzuD55d1I0lVJ ubPBJG4WiPssHKaWP4zKvJk9arUVD3apkSDumlCK3pcnwLN4nTDhD7oeyS+6y0IpLn t4OYja0T/QJzDqXPMIiMBBX2o/FSmRkRdyLE28l0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Sutter , Florian Westphal , =?utf-8?b?TcOhdMOpIEVja2w=?= , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 4.19 041/115] netfilter: nft_tproxy: Fix port selector on Big Endian Date: Tue, 7 Jan 2020 21:54:11 +0100 Message-Id: <20200107205301.834289203@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200107205240.283674026@linuxfoundation.org> References: <20200107205240.283674026@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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;