diff mbox series

[nf-next,1/6] Revert "netfilter: conntrack: mark UDP zero checksum as CHECKSUM_UNNECESSARY"

Message ID 20220315091513.66544-2-pablo@netfilter.org (mailing list archive)
State Accepted
Commit bbfbf7a5e77e4c899982c7df4cf3197cb6f99be4
Delegated to: Netdev Maintainers
Headers show
Series [nf-next,1/6] Revert "netfilter: conntrack: mark UDP zero checksum as CHECKSUM_UNNECESSARY" | expand

Checks

Context Check Description
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Pull request is its own cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers fail 2 blamed authors not CCed: kevmitch@arista.com fw@strlen.de; 4 maintainers not CCed: kevmitch@arista.com kadlec@netfilter.org coreteam@netfilter.org fw@strlen.de
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 11 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/tree_selection success Guessing tree name failed - patch did not apply

Commit Message

Pablo Neira Ayuso March 15, 2022, 9:15 a.m. UTC 
From: Florian Westphal <fw@strlen.de>

This reverts commit 5bed9f3f63f8f9d2b1758c24640cbf77b5377511.

Gal Presman says:
 this patch broke geneve tunnels, or possibly all udp tunnels?
 A simple test that creates two geneve tunnels and runs tcp iperf fails
 and results in checksum errors (TcpInCsumErrors).

Original commit wanted to fix nf_reject with zero checksum,
so it appears better to change nf reject infra instead.

Fixes: 5bed9f3f63f8f ("netfilter: conntrack: mark UDP zero checksum as CHECKSUM_UNNECESSARY")
Reported-by: Gal Pressman <gal@nvidia.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nf_conntrack_proto_udp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

patchwork-bot+netdevbpf@kernel.org March 15, 2022, 7 p.m. UTC | #1 
Hello:

This series was applied to netdev/net-next.git (master)
by Florian Westphal <fw@strlen.de>:

On Tue, 15 Mar 2022 10:15:08 +0100 you wrote:
> From: Florian Westphal <fw@strlen.de>
> 
> This reverts commit 5bed9f3f63f8f9d2b1758c24640cbf77b5377511.
> 
> Gal Presman says:
>  this patch broke geneve tunnels, or possibly all udp tunnels?
>  A simple test that creates two geneve tunnels and runs tcp iperf fails
>  and results in checksum errors (TcpInCsumErrors).
> 
> [...]

Here is the summary with links:
  - [nf-next,1/6] Revert "netfilter: conntrack: mark UDP zero checksum as CHECKSUM_UNNECESSARY"
    https://git.kernel.org/netdev/net-next/c/bbfbf7a5e77e
  - [nf-next,2/6] netfilter: nf_tables: Reject tables of unsupported family
    https://git.kernel.org/netdev/net-next/c/f1082dd31fe4
  - [nf-next,3/6] netfilter: flowtable: Support GRE
    https://git.kernel.org/netdev/net-next/c/4e8d9584d154
  - [nf-next,4/6] act_ct: Support GRE offload
    https://git.kernel.org/netdev/net-next/c/fcb6aa86532c
  - [nf-next,5/6] net/mlx5: Support GRE conntrack offload
    https://git.kernel.org/netdev/net-next/c/1918ace1382d
  - [nf-next,6/6] netfilter: bridge: clean up some inconsistent indenting
    https://git.kernel.org/netdev/net-next/c/334ff12284fc

You are awesome, thank you!
diff mbox series

Patch

diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index 12f793d8fe0c..3b516cffc779 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -63,10 +63,8 @@  static bool udp_error(struct sk_buff *skb,
 	}
 
 	/* Packet with no checksum */
-	if (!hdr->check) {
-		skb->ip_summed = CHECKSUM_UNNECESSARY;
+	if (!hdr->check)
 		return false;
-	}
 
 	/* Checksum invalid? Ignore.
 	 * We skip checking packets on the outgoing path