From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 29 Jan 2022 14:47:46 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v5.4.176~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54a890a4f517ad4a56677665f411e39d9ed30677;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	netfilter-nft_payload-do-not-update-layer-4-checksum-when-mangling-fragments.patch
---

diff --git a/queue-4.19/netfilter-nft_payload-do-not-update-layer-4-checksum-when-mangling-fragments.patch b/queue-4.19/netfilter-nft_payload-do-not-update-layer-4-checksum-when-mangling-fragments.patch
new file mode 100644
index 00000000000..489212bd57b
--- /dev/null
+++ b/queue-4.19/netfilter-nft_payload-do-not-update-layer-4-checksum-when-mangling-fragments.patch
@@ -0,0 +1,33 @@
+From 4e1860a3863707e8177329c006d10f9e37e097a8 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Wed, 5 Jan 2022 16:09:57 +0100
+Subject: netfilter: nft_payload: do not update layer 4 checksum when mangling fragments
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/netfilter/nft_payload.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/net/netfilter/nft_payload.c
++++ b/net/netfilter/nft_payload.c
+@@ -194,6 +194,9 @@ static int nft_payload_l4csum_offset(con
+ 				     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);
diff --git a/queue-4.19/series b/queue-4.19/series
index a19be899810..1f24705f5b6 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -5,3 +5,4 @@ udf-restore-i_lenalloc-when-inode-expansion-fails.patch
 udf-fix-null-ptr-deref-when-converting-from-inline-format.patch
 pm-wakeup-simplify-the-output-logic-of-pm_show_wakelocks.patch
 drm-etnaviv-relax-submit-size-limits.patch
+netfilter-nft_payload-do-not-update-layer-4-checksum-when-mangling-fragments.patch