From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: stable@vger.kernel.org, netfilter-devel@vger.kernel.org,
Steffen Weinreich <steve@weinreich.org>
Subject: Re: [PATCH 4.19.y] netfilter: nft_payload: do not update layer 4 checksum when mangling fragments
Date: Fri, 28 Jan 2022 12:43:57 +0100 [thread overview]
Message-ID: <YfPW/Y+MjU79d7V7@salvia> (raw)
In-Reply-To: <20220128113821.7009-1-fw@strlen.de>
On Fri, Jan 28, 2022 at 12:38:21PM +0100, Florian Westphal wrote:
> From: Pablo Neira Ayuso <pablo@netfilter.org>
>
> commit 4e1860a3863707e8177329c006d10f9e37e097a8 upstream.
>
> IP fragments do not come with the transport header, hence skip bogus
> layer 4 checksum updates.
>
> Fixes: 1814096980bb ("netfilter: nft_payload: layer 4 checksum adjustment for pseudoheader fields")
> Reported-and-tested-by: Steffen Weinreich <steve@weinreich.org>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> This is already in the 5.y branches but 4.19 needs a minor
> tweak as ->fragoff member resides in xt sub-struct.
Thanks for taking care of this -stable submission.
> net/netfilter/nft_payload.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
> index b1a9f330a51f..fd87216bc0a9 100644
> --- a/net/netfilter/nft_payload.c
> +++ b/net/netfilter/nft_payload.c
> @@ -194,6 +194,9 @@ static int nft_payload_l4csum_offset(const struct nft_pktinfo *pkt,
> struct sk_buff *skb,
> unsigned int *l4csum_offset)
> {
> + if (pkt->xt.fragoff)
> + return -1;
> +
> switch (pkt->tprot) {
> case IPPROTO_TCP:
> *l4csum_offset = offsetof(struct tcphdr, check);
> --
> 2.34.1
>
next prev parent reply other threads:[~2022-01-28 11:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 11:38 [PATCH 4.19.y] netfilter: nft_payload: do not update layer 4 checksum when mangling fragments Florian Westphal
2022-01-28 11:43 ` Pablo Neira Ayuso [this message]
2022-01-29 11:50 ` Greg KH
2022-01-29 12:04 ` Florian Westphal
2022-01-29 13:52 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YfPW/Y+MjU79d7V7@salvia \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=steve@weinreich.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox