[PATCH net] net: netpoll: Initialize UDP checksum field before checksumming

Breno Leitao posted 1 patch 3 months, 2 weeks ago
net/core/netpoll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH net] net: netpoll: Initialize UDP checksum field before checksumming
Posted by Breno Leitao 3 months, 2 weeks ago
commit f1fce08e63fe ("netpoll: Eliminate redundant assignment") removed
the initialization of the UDP checksum, which was wrong and broke
netpoll IPv6 transmission due to bad checksumming.

udph->check needs to be set before calling csum_ipv6_magic().

Fixes: f1fce08e63fe ("netpoll: Eliminate redundant assignment")
Signed-off-by: Breno Leitao <leitao@debian.org>
---
 net/core/netpoll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 4ddb7490df4b8..6ad84d4a2b464 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -432,6 +432,7 @@ int netpoll_send_udp(struct netpoll *np, const char *msg, int len)
 	udph->dest = htons(np->remote_port);
 	udph->len = htons(udp_len);
 
+	udph->check = 0;
 	if (np->ipv6) {
 		udph->check = csum_ipv6_magic(&np->local_ip.in6,
 					      &np->remote_ip.in6,
@@ -460,7 +461,6 @@ int netpoll_send_udp(struct netpoll *np, const char *msg, int len)
 		skb_reset_mac_header(skb);
 		skb->protocol = eth->h_proto = htons(ETH_P_IPV6);
 	} else {
-		udph->check = 0;
 		udph->check = csum_tcpudp_magic(np->local_ip.ip,
 						np->remote_ip.ip,
 						udp_len, IPPROTO_UDP,

---
base-commit: 720d4a1714e78cfdc05d44352868601be9c3de94
change-id: 20250620-netpoll_fix-8c678facd8d9

Best regards,
--  
Breno Leitao <leitao@debian.org>
Re: [PATCH net] net: netpoll: Initialize UDP checksum field before checksumming
Posted by Willem de Bruijn 3 months, 2 weeks ago
Breno Leitao wrote:
> commit f1fce08e63fe ("netpoll: Eliminate redundant assignment") removed
> the initialization of the UDP checksum, which was wrong and broke
> netpoll IPv6 transmission due to bad checksumming.
> 
> udph->check needs to be set before calling csum_ipv6_magic().
> 
> Fixes: f1fce08e63fe ("netpoll: Eliminate redundant assignment")
> Signed-off-by: Breno Leitao <leitao@debian.org>

Reviewed-by: Willem de Bruijn <willemb@google.com>
Re: [PATCH net] net: netpoll: Initialize UDP checksum field before checksumming
Posted by Willem de Bruijn 3 months, 2 weeks ago
Breno Leitao wrote:
> commit f1fce08e63fe ("netpoll: Eliminate redundant assignment") removed
> the initialization of the UDP checksum, which was wrong and broke
> netpoll IPv6 transmission due to bad checksumming.
> 
> udph->check needs to be set before calling csum_ipv6_magic().
> 
> Fixes: f1fce08e63fe ("netpoll: Eliminate redundant assignment")
> Signed-off-by: Breno Leitao <leitao@debian.org>

On second thought: small nit: net/core/netpoll.c patches generally
only have netpoll: as prefix, not net: netpoll:

Also, perhaps just revert the offending patch? Revert, rather than
forward fix.

That said, current approach works too.
> ---
>  net/core/netpoll.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index 4ddb7490df4b8..6ad84d4a2b464 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -432,6 +432,7 @@ int netpoll_send_udp(struct netpoll *np, const char *msg, int len)
>  	udph->dest = htons(np->remote_port);
>  	udph->len = htons(udp_len);
>  
> +	udph->check = 0;
>  	if (np->ipv6) {
>  		udph->check = csum_ipv6_magic(&np->local_ip.in6,
>  					      &np->remote_ip.in6,
> @@ -460,7 +461,6 @@ int netpoll_send_udp(struct netpoll *np, const char *msg, int len)
>  		skb_reset_mac_header(skb);
>  		skb->protocol = eth->h_proto = htons(ETH_P_IPV6);
>  	} else {
> -		udph->check = 0;
>  		udph->check = csum_tcpudp_magic(np->local_ip.ip,
>  						np->remote_ip.ip,
>  						udp_len, IPPROTO_UDP,
> 
> ---
> base-commit: 720d4a1714e78cfdc05d44352868601be9c3de94
> change-id: 20250620-netpoll_fix-8c678facd8d9
> 
> Best regards,
> --  
> Breno Leitao <leitao@debian.org>
>
Re: [PATCH net] net: netpoll: Initialize UDP checksum field before checksumming
Posted by Simon Horman 3 months, 2 weeks ago
On Fri, Jun 20, 2025 at 11:48:55AM -0700, Breno Leitao wrote:
> commit f1fce08e63fe ("netpoll: Eliminate redundant assignment") removed
> the initialization of the UDP checksum, which was wrong and broke
> netpoll IPv6 transmission due to bad checksumming.
> 
> udph->check needs to be set before calling csum_ipv6_magic().
> 
> Fixes: f1fce08e63fe ("netpoll: Eliminate redundant assignment")
> Signed-off-by: Breno Leitao <leitao@debian.org>

Reviewed-by: Simon Horman <horms@kernel.org>