net: drop bad gso csum_start and offset in virtio_net_hdr
Subsystems (7)
PATCH 1/1 net: drop bad gso csum_start and offset in virtio_net_hdr
From: Willem de Bruijn <[email protected]>
Tighten csum_start and csum_offset checks in virtio_net_hdr_to_skb for GSO packets.
The function already checks that a checksum requested with VIRTIO_NET_HDR_F_NEEDS_CSUM is in skb linear. But for GSO packets this might not hold for segs after segmentation.
Syzkaller demonstrated to reach this warning in skb_checksum_help
offset = skb_checksum_start_offset(skb); ret = -EINVAL; if (WARN_ON_ONCE(offset >= skb_headlen(skb)))
By injecting a TSO packet:
WARNING: CPU: 1 PID: 3539 at net/core/dev.c:3284 skb_checksum_help+0x3d0/0x5b0 ip_do_fragment+0x209/0x1b20 net/ipv4/ip_output.c:774 ip_finish_output_gso net/ipv4/ip_output.c:279 [inline] __ip_finish_output+0x2bd/0x4b0 net/ipv4/ip_output.c:301 iptunnel_xmit+0x50c/0x930 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x2296/0x2c70 net/ipv4/ip_tunnel.c:813 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x759/0xa60 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4850 [inline] netdev_start_xmit include/linux/netdevice.h:4864 [inline] xmit_one net/core/dev.c:3595 [inline] dev_hard_start_xmit+0x261/0x8c0 net/core/dev.c:3611 __dev_queue_xmit+0x1b97/0x3c90 net/core/dev.c:4261 packet_snd net/packet/af_packet.c:3073 [inline]
The geometry of the bad input packet at tcp_gso_segment:
[ 52.003050][ T8403] skb len=12202 headroom=244 headlen=12093 tailroom=0 [ 52.003050][ T8403] mac=(168,24) mac_len=24 net=(192,52) trans=244 [ 52.003050][ T8403] shinfo(txflags=0 nr_frags=1 gso(size=1552 type=3 segs=0)) [ 52.003050][ T8403] csum(0x60000c7 start=199 offset=1536
ip_summed=3 complete_sw=0 valid=0 level=0)
Migitage with stricter input validation.
csum_offset: for GSO packets, deduce the correct value from gso_type. This is already done for USO. Extend it to TSO. Let UFO be:
udp[46]_ufo_fragment ignores these fields and always computes the checksum in software.
csum_start: finding the real offset requires parsing to the transport header. Do not add a parser, use existing segmentation parsing. Thanks to SKB_GSO_DODGY, that also catches bad packets that are hw offloaded. Again test both TSO and USO. Do not test UFO for the above reason, and do not test UDP tunnel offload.
GSO packet are almost always CHECKSUM_PARTIAL. USO packets may be CHECKSUM_NONE since commit 10154dbded6d6 ("udp: Allow GSO transmit from devices with no checksum offload"), but then still these fields are initialized correctly in udp4_hwcsum/udp6_hwcsum_outgoing. So no need to test for ip_summed == CHECKSUM_PARTIAL first.
This revises an existing fix mentioned in the Fixes tag, which broke small packets with GSO offload, as detected by kselftests.
--- include/linux/virtio_net.h | 16 +++++----------- net/ipv4/tcp_offload.c | 3 +++ net/ipv4/udp_offload.c | 3 +++ 3 files changed, 11 insertions(+), 11 deletions(-)
include/linux/virtio_net.h +5 -11
@@ -56,7 +56,6 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,unsigned int thlen =0 ;unsigned int p_off =0 ;unsigned int ip_proto; -u64 ret, remainder, gso_size;if (hdr->gso_type !=VIRTIO_NET_HDR_GSO_NONE ) {switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN ) {
@@ -99,16 +98,6 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,u32 off =__virtio16_to_cpu (little_endian, hdr->csum_offset);u32 needed = start +max_t (u32, thlen, off +sizeof (__sum16)); -if (hdr->gso_size) { - gso_size =__virtio16_to_cpu (little_endian, hdr->gso_size); - ret =div64_u64_rem (skb->len, gso_size, &remainder); -if (!(ret && (hdr->gso_size > needed) && - ((remainder > needed) || (remainder ==0 )))) { -return -EINVAL ; - } -skb_shinfo (skb)->tx_flags |=SKBFL_SHARED_FRAG ; - } -if (!pskb_may_pull (skb, needed))return -EINVAL ;
@@ -182,6 +171,11 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,if (gso_type !=SKB_GSO_UDP_L4 )return -EINVAL ;break ; +case SKB_GSO_TCPV4 : +case SKB_GSO_TCPV6 : +if (skb->csum_offset != offsetof(struct tcphdr , check)) +return -EINVAL ; +break ; }/* Kernel has a special handling for GSO_BY_FRAGS. */
net/ipv4/tcp_offload.c +3 -0
@@ -140,6 +140,9 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (thlen <sizeof (*th)) goto out; +if (unlikely (skb->csum_start != skb->transport_header)) + goto out; +if (!pskb_may_pull (skb, thlen)) goto out;
net/ipv4/udp_offload.c +3 -0
@@ -278,6 +278,9 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,if (gso_skb->len <=sizeof (*uh) + mss)return ERR_PTR (-EINVAL ); +if (unlikely (gso_skb->csum_start != gso_skb->transport_header)) +return ERR_PTR (-EINVAL ); +if (skb_gso_ok (gso_skb, features |NETIF_F_GSO_ROBUST )) {/* Packet is from an untrusted source, reset gso_segs. */ skb_shinfo(gso_skb)->gso_segs = DIV_ROUND_UP(gso_skb->len - sizeof(*uh),
Signature · 1 line
2.46.0.rc1.232.g9752f9e123-goog
Quoted 2 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
...
net/ipv4/tcp_offload.c struct sk_buff *tcp_gso_segment(struct sk_buff *skb, · line 145
Quoted 12 lines
/* Kernel has a special handling for GSO_BY_FRAGS. */net/ipv4/tcp_offload.c +3
-0@@ -140,6 +140,9 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (thlen <sizeof (*th)) goto out; +if (unlikely (skb->csum_start != skb->transport_header)) + goto out; +
Using skb_transport_header() will make sure DEBUG_NET_WARN_ON_ONCE() will fire for debug kernels,
with no additional costs for non debug kernels (compiler will generate not use skb->head at all)
if (unlikely(skb->csum_start != skb_transport_header(skb) - skb->head))
goto out;
(This will match the corresponding initialization in __tcp_v4_send_check())
Quoted 26 lines · Eric Dumazet
Quoted 2 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
...
net/ipv4/tcp_offload.c struct sk_buff *tcp_gso_segment(struct sk_buff *skb, · line 145
Quoted 12 lines
/* Kernel has a special handling for GSO_BY_FRAGS. */net/ipv4/tcp_offload.c +3
-0@@ -140,6 +140,9 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (thlen <sizeof (*th)) goto out; +if (unlikely (skb->csum_start != skb->transport_header)) + goto out; +Using
skb_transport_header()will make sureDEBUG_NET_WARN_ON_ONCE()will fire for debug kernels,
with no additional costs for non debug kernels (compiler will generate not useskb->headat all)
Quoted 4 lines
if (
unlikely(skb->csum_start != skb_transport_header(skb) - skb->head))goto out;(This will match the corresponding initialization in
__tcp_v4_send_check())
Will do, thanks.
Paolo Abeni
maintainerOn 7/26/24 04:32, Willem de Bruijn wrot> @@ -182,6 +171,11 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
include/linux/virtio_net.h static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, · line 175
Quoted 5 lines
if (
gso_type!=SKB_GSO_UDP_L4)
return-EINVAL;
break;include/linux/virtio_net.h +2
-0+case SKB_GSO_TCPV4 : +case SKB_GSO_TCPV6 :
I think we need to add here an additional check:
if (!(hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM)) return -EINVAL;
Quoted 11 lines
include/linux/virtio_net.h +3
-0+if (skb->csum_offset != offsetof(struct tcphdr , check)) +return -EINVAL ; +break ; }/* Kernel has a special handling for GSO_BY_FRAGS. */ net/ipv4/tcp_offload.c +0
-0
net/ipv4/tcp_offload.c struct sk_buff *tcp_gso_segment(struct sk_buff *skb, · line 144
Quoted 5 lines
net/ipv4/tcp_offload.c +2
-0@@ -140,6 +140,9 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (thlen <sizeof (*th)) goto out; +if (unlikely (skb->csum_start != skb->transport_header)) + goto out;
Given that for packet injected from user-space, the transport offset is set to csum_start by skb_partial_csum_set(), do we need the above check? If so, why don't we need another similar one for csum_offset even here?
Thanks,
Paolo
Quoted 9 lines · Paolo Abeni
On 7/26/24 04:32, Willem de Bruijn wrot> @@ -182,6 +171,11 @@ static inline int virtio_net_hdr_to_skb(struct
sk_buff*skb,include/linux/virtio_net.h static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, · line 175
Quoted 5 lines
if (gso_type != SKB_GSO_UDP_L4) return -EINVAL; break;include/linux/virtio_net.h +2
-0+case SKB_GSO_TCPV4 : +case SKB_GSO_TCPV6 :
Quoted 5 lines
I think we need to add here an additional check:
if (!(hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM)) return -EINVAL;
Historically this interface has been able to request VIRTIO_NET_HDR_GSO_* without VIRTIO_NET_HDR_F_NEEDS_CSUM.
I agree that that makes little sense. Until now we have been accommodating it, however. See the else branch if that checksum offload flag is not set.
I would love to clamp down on this, as those packets are essentially illegal. But we should probably leave that discussion for a separate patch?
Quoted 14 lines
Quoted 14 lines
include/linux/virtio_net.h +3
-0+if (skb->csum_offset != offsetof(struct tcphdr , check)) +return -EINVAL ; +break ; }/* Kernel has a special handling for GSO_BY_FRAGS. */ net/ipv4/tcp_offload.c +0
-0@@ -140,6 +140,9 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (thlen <sizeof (*th)) goto out;
Quoted 6 lines
net/ipv4/tcp_offload.c struct sk_buff *tcp_gso_segment(struct sk_buff *skb, · line 144
Quoted 2 lines
net/ipv4/tcp_offload.c +2
-0+if (unlikely (skb->csum_start != skb->transport_header)) + goto out;Given that for packet injected from user-space, the transport offset is set to
csum_startbyskb_partial_csum_set(), do we need the above check? If so, why don't we need another similar one forcsum_offseteven here?
Same point. Sadly it is not set if checksum offload is not requested.
Paolo Abeni
maintainerQuoted 10 lines · Willem de Bruijn
Quoted 9 lines · Paolo Abeni
On 7/26/24 04:32, Willem de Bruijn wrot> @@ -182,6 +171,11 @@ static inline int virtio_net_hdr_to_skb(struct
sk_buff*skb,Quoted 5 lines
if (gso_type != SKB_GSO_UDP_L4) return -EINVAL; break;include/linux/virtio_net.h +2
-0+case SKB_GSO_TCPV4 : +case SKB_GSO_TCPV6 :
Quoted 8 lines
Quoted 5 lines
I think we need to add here an additional check:
if (!(hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM)) return -EINVAL;Historically this interface has been able to request VIRTIO_NET_HDR_GSO_* without
VIRTIO_NET_HDR_F_NEEDS_CSUM.
I see. I looked at the SKB_GSO_UDP_L4 case, but I did not dig into history.
Quoted 3 lines
I would love to clamp down on this, as those packets are essentially illegal. But we should probably leave that discussion for a separate patch?
Yep, I guess we have to keep the two discussion separate.
As a consequence, I'm fine with the current checks (with Eric's suggested changes).
Thanks,
Paolo
PATCH 1/1 net: drop bad gso csum_start and offset in virtio_net_hdr
In reply to Willem de BruijnHello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cf
Thanks, Adrian.
Greg KH
maintainerQuoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cf
Please provide a working backport, the change does not properly cherry-pick.
greg k-h
Hello,
My colleague Mathieu already submitted the tested patch here https://lore.kernel.org/stable/[email protected]/T/#u.
Links to Flatcar patch and test run:
* https://github.com/flatcar/scripts/pull/2194/commits/33259937abe19f612faac255706d5a509666fbc9
* https://github.com/flatcar/scripts/actions/runs/10251425081
But this patch has been tested and submitted only for the 6.6.y branch.
It will take some time to properly test the 6.1.y, as Flatcar is going to be fully upgraded on all channels to 6.6.y, but I will come back with the patch and test results.
Thanks, Adrian.
________________________________________
From: Greg KH <[email protected]>
Sent: Wednesday, August 7, 2024 5:12 PM
To: Adrian Vladu <[email protected]>
Cc: [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]> Subject: Re: [PATCH net] net: drop bad gso csum_start and offset in virtio_net_hdr
Quoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cf
Please provide a working backport, the change does not properly cherry-pick.
greg k-h
Quoted 10 lines · Greg KH
Quoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cfPlease provide a working backport, the change does not properly cherry-pick.
greg k-h
Hey Greg, hey Sasha,
this patch also needs backporting to the 6.6.y and 6.10.y series as the buggy commit was backported to to all three series.
I have tested against my local trees and it seems to apply cleanly on top of 6.6 and 6.10, yet if it helps I can also send out patches for stable versions of those, so we can have the fix for two out of three series while we wait for the backported version for 6.1.
I also saw that the patch didn't make it to 6.10.4rc1 and is not in
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-6.10
Cheers,
Chris
Greg KH
maintainerQuoted 10 lines · Christian Heusel
Quoted 9 lines · Greg KH
Quoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cfPlease provide a working backport, the change does not properly cherry-pick.
Quoted 6 lines
Quoted 1 line
greg k-h
Hey Greg, hey Sasha,
this patch also needs backporting to the 6.6.y and 6.10.y series as the buggy commit was backported to to all three series.
What buggy commit?
And how was this tested, it does not apply cleanly to the trees for me at all.
confused,
greg k-h
Quoted 11 lines · Greg KH
Quoted 10 lines · Christian Heusel
Quoted 9 lines · Greg KH
Quoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cfPlease provide a working backport, the change does not properly cherry-pick.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
greg k-h
Hey Greg, hey Sasha,
this patch also needs backporting to the 6.6.y and 6.10.y series as the buggy commit was backported to to all three series.
What buggy commit?
The issue is that commit e269d79c7d35 ("net: missing check virtio") introduces a bug which is fixed by 89add40066f9 ("net: drop bad gso csum_start and offset in virtio_net_hdr") which it also carries a "Fixes:" tag for.
Therefore it would be good to also get 89add40066f9 backported.
Quoted 2 lines
And how was this tested, it does not apply cleanly to the trees for me at all.
I have tested this with the procedure as described in [0]:
$ git switch linux-6.10.y
$ git cherry-pick -x 89add40066f9ed9abe5f7f886fe5789ff7e0c50e
Auto-merging net/ipv4/udp_offload.c
[linux-6.10.y fbc0d2bea065] net: drop bad gso csum_start and offset in virtio_net_hdr
Author: Willem de Bruijn <[email protected]>
Date: Mon Jul 29 16:10:12 2024 -0400
3 files changed, 12 insertions(+), 11 deletions(-)This also works for linux-6.6.y, but not for linux-6.1.y, as it fails with a merge error there.
The relevant commit is confirmed to fix the issue in the relevant Githu issue here[1]:
@marek22k commented
> They both fix the problem for me.
Quoted 1 line
confused,
Sorry for the confusion! I hope the above clears things up a little :)
Quoted 1 line
greg k-h
Cheers,
Christian
[0]: https://lore.kernel.org/all/2024060624-platinum-ladies-9214@gregkh/
[1]: https://github.com/tailscale/tailscale/issues/13041#issuecomment-2272326491
Hello,
Hopefully I can also offer some clarity on the issue in the context of the Linux kernel version 6.6.44.
Regarding the 6.6.y case, this commit is the offending one:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.6.y&id=90d41ebe0cd4635f6410471efc1dd71b33e894cf
With this commit, Flatcar virtual machines using Linux kernel version 6.6.44 running on QEMU-KVM AMD64 hosts started having these kind of messages in the dmesg while the network tests were failing:
``` [ 237.422038] eth0: bad gso: type: 1, size: 1432 ```
```bash $ dmesg | grep "bad gso" | wc -l 531 ```
We observed that by cherry-picking this commit https://github.com/torvalds/linux/commit/89add40066f9ed9abe5f7f886fe5789ff7e0c50e on the 6.6.44 tree, the failures were fixed and patch has already been sent here: https://lore.kernel.org/stable/[email protected]/T/#u
To give some context, in the 89add40066f9ed9abe5f7f886fe5789ff7e0c50e commit description, it is stated that the commit fixes the https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8, that is how we got to testing the fix in the first place. Flatcar patch commit: https://github.com/flatcar/scripts/pull/2194/commits/33259937abe19f612faac255706d5a509666fbc9 that has been built for the Flatcar guests and successfully tested on QEMU-KVM AMD64 hosts.
I tried manually to directly cherry-pick 89add40066f9ed9abe5f7f886fe5789ff7e0c50e on the 6.6.y branch and it works fine:
```bash git clone git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git -b linux-6.6.y cd linux git remote add upstream https://github.com/torvalds/linux/ git fetch upstream git cherry-pick 89add40066f9ed9abe5f7f886fe5789ff7e0c50e ```
Related to the 6.1.y tree, the commit 89add40066f9ed9abe5f7f886fe5789ff7e0c50e cannot be cherry-picked without conflicts, and it requires more careful attention and testing. Related to the 6.10.y tree, the commit 89add40066f9ed9abe5f7f886fe5789ff7e0c50e can be cherry-picked, but has not been tested by us.
Thanks, Adrian.
________________________________________
From: Christian Heusel
Sent: Thursday, August 8, 2024 12:52 PM
To: Greg KH
Cc: Adrian Vladu; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected] Subject: Re: [PATCH net] net: drop bad gso csum_start and offset in virtio_net_hdr
Quoted 30 lines · Greg KH
Quoted 27 lines · Christian Heusel
Quoted 12 lines · Greg KH
Quoted 7 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
Quoted 7 lines
Please provide a working backport, the change does not properly
cherry-pick.
greg k-h
Hey Greg, hey Sasha,
Quoted 7 lines
Quoted 3 lines
this patch also needs backporting to the 6.6.y and 6.10.y series as the
buggy commit was backported to to all three series.
What buggy commit?
The issue is that commit e269d79c7d35 ("net: missing check virtio")
introduces a bug which is fixed by 89add40066f9 ("net: drop bad gso
csum_start and offset in virtio_net_hdr") which it also carries a
"Fixes:" tag for.
Therefore it would be good to also get 89add40066f9 backported.
Quoted 3 lines
And how was this tested, it does not apply cleanly to the trees for me
at all.
I have tested this with the procedure as described in [0]:
$ git switch linux-6.10.y
$ git cherry-pick -x 89add40066f9ed9abe5f7f886fe5789ff7e0c50e
Auto-merging net/ipv4/udp_offload.c
[linux-6.10.y fbc0d2bea065] net: drop bad gso csum_start and offset in virtio_net_hdr
Author: Willem de Bruijn <[email protected]>
Date: Mon Jul 29 16:10:12 2024 -0400
3 files changed, 12 insertions(+), 11 deletions(-)
This also works for linux-6.6.y, but not for linux-6.1.y, as it fails
with a merge error there.
The relevant commit is confirmed to fix the issue in the relevant Githu
issue here[1]:
@marek22k commented
> They both fix the problem for me.
Quoted 1 line
confused,
Sorry for the confusion! I hope the above clears things up a little :)
Quoted 1 line
greg k-h
Cheers,
Christian
[0]: https://lore.kernel.org/all/2024060624-platinum-ladies-9214@gregkh/
[1]: https://github.com/tailscale/tailscale/issues/13041#issuecomment-2272326491
Quoted 54 lines · Christian Heusel
Quoted 11 lines · Greg KH
Quoted 10 lines · Christian Heusel
Quoted 9 lines · Greg KH
Quoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cfPlease provide a working backport, the change does not properly cherry-pick.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
greg k-h
Hey Greg, hey Sasha,
this patch also needs backporting to the 6.6.y and 6.10.y series as the buggy commit was backported to to all three series.
What buggy commit?
The issue is that commit
e269d79c7d35("net: missing check virtio") introduces a bug which is fixed by89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr") which it also carries a "Fixes:" tag for.Therefore it would be good to also get
89add40066f9backported.Quoted 2 lines
And how was this tested, it does not apply cleanly to the trees for me at all.
I have tested this with the procedure as described in [0]:
$ git switch linux-6.10.y $ git cherry-pick -x 89add40066f9ed9abe5f7f886fe5789ff7e0c50e Auto-merging net/ipv4/udp_offload.c [linux-6.10.y fbc0d2bea065] net: drop bad gso csum_start and offset in virtio_net_hdr Author: Willem de Bruijn <[email protected]> Date: Mon Jul 29 16:10:12 2024 -0400 3 files changed, 12 insertions(+), 11 deletions(-)This also works for linux-6.6.y, but not for linux-6.1.y, as it fails with a merge error there.
The relevant commit is confirmed to fix the issue in the relevant Githu issue here[1]:
@marek22k commented
> They both fix the problem for me.Quoted 1 line
confused,
Sorry for the confusion! I hope the above clears things up a little :)
Quoted 7 lines
Quoted 1 line
greg k-h
Cheers,
Christian[0]: https://lore.kernel.org/all/2024060624-platinum-ladies-9214@gregkh/
[1]: https://github.com/tailscale/tailscale/issues/13041#issuecomment-2272326491
Since I didn't hear from anybody so far about the above issue it's a bit unclear on how to proceed here. I still think that I would make sense to go with my above suggestion about patching at least 2 out of the 3 stable series where the patch applies cleanly.
~ Chris
Michael S. Tsirkin
maintainerQuoted 63 lines · Christian Heusel
Quoted 54 lines · Christian Heusel
Quoted 11 lines · Greg KH
Quoted 10 lines · Christian Heusel
Quoted 9 lines · Greg KH
Quoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cfPlease provide a working backport, the change does not properly cherry-pick.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
greg k-h
Hey Greg, hey Sasha,
this patch also needs backporting to the 6.6.y and 6.10.y series as the buggy commit was backported to to all three series.
What buggy commit?
The issue is that commit
e269d79c7d35("net: missing check virtio") introduces a bug which is fixed by89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr") which it also carries a "Fixes:" tag for.Therefore it would be good to also get
89add40066f9backported.Quoted 2 lines
And how was this tested, it does not apply cleanly to the trees for me at all.
I have tested this with the procedure as described in [0]:
$ git switch linux-6.10.y $ git cherry-pick -x 89add40066f9ed9abe5f7f886fe5789ff7e0c50e Auto-merging net/ipv4/udp_offload.c [linux-6.10.y fbc0d2bea065] net: drop bad gso csum_start and offset in virtio_net_hdr Author: Willem de Bruijn <[email protected]> Date: Mon Jul 29 16:10:12 2024 -0400 3 files changed, 12 insertions(+), 11 deletions(-)This also works for linux-6.6.y, but not for linux-6.1.y, as it fails with a merge error there.
The relevant commit is confirmed to fix the issue in the relevant Githu issue here[1]:
@marek22k commented
> They both fix the problem for me.Quoted 1 line
confused,
Sorry for the confusion! I hope the above clears things up a little :)
Quoted 7 lines
Quoted 1 line
greg k-h
Cheers,
Christian[0]: https://lore.kernel.org/all/2024060624-platinum-ladies-9214@gregkh/
[1]: https://github.com/tailscale/tailscale/issues/13041#issuecomment-2272326491
Quoted 6 lines
Since I didn't hear from anybody so far about the above issue it's a bit unclear on how to proceed here. I still think that I would make sense to go with my above suggestion about patching at least 2 out of the 3 stable series where the patch applies cleanly.
~ Chris
Do what Greg said:
Please provide a working backport, the change does not properly cherry-pick.
that means, post backported patches to stable, copy list.
Signature · 1 line
MST
Quoted 73 lines · Michael S. Tsirkin
Quoted 63 lines · Christian Heusel
Quoted 54 lines · Christian Heusel
Quoted 11 lines · Greg KH
Quoted 10 lines · Christian Heusel
Quoted 9 lines · Greg KH
Quoted 4 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.6.44&id=3D90d41ebe0cd4635f6410471efc1dd71b33e894cfPlease provide a working backport, the change does not properly cherry-pick.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
greg k-h
Hey Greg, hey Sasha,
this patch also needs backporting to the 6.6.y and 6.10.y series as the buggy commit was backported to to all three series.
What buggy commit?
The issue is that commit
e269d79c7d35("net: missing check virtio") introduces a bug which is fixed by89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr") which it also carries a "Fixes:" tag for.Therefore it would be good to also get
89add40066f9backported.Quoted 2 lines
And how was this tested, it does not apply cleanly to the trees for me at all.
I have tested this with the procedure as described in [0]:
$ git switch linux-6.10.y $ git cherry-pick -x 89add40066f9ed9abe5f7f886fe5789ff7e0c50e Auto-merging net/ipv4/udp_offload.c [linux-6.10.y fbc0d2bea065] net: drop bad gso csum_start and offset in virtio_net_hdr Author: Willem de Bruijn <[email protected]> Date: Mon Jul 29 16:10:12 2024 -0400 3 files changed, 12 insertions(+), 11 deletions(-)This also works for linux-6.6.y, but not for linux-6.1.y, as it fails with a merge error there.
The relevant commit is confirmed to fix the issue in the relevant Githu issue here[1]:
@marek22k commented
> They both fix the problem for me.Quoted 1 line
confused,
Sorry for the confusion! I hope the above clears things up a little :)
Quoted 7 lines
Quoted 1 line
greg k-h
Cheers,
Christian[0]: https://lore.kernel.org/all/2024060624-platinum-ladies-9214@gregkh/
[1]: https://github.com/tailscale/tailscale/issues/13041#issuecomment-2272326491Quoted 6 lines
Since I didn't hear from anybody so far about the above issue it's a bit unclear on how to proceed here. I still think that I would make sense to go with my above suggestion about patching at least 2 out of the 3 stable series where the patch applies cleanly.
~ Chris
Quoted 6 lines
Do what Greg said:
Please provide a working backport, the change does not properly cherry-pick.
that means, post backported patches to stable, copy list.
Alright, will do!
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
________________________________________
From: Christian Heusel
Sent: Wednesday, August 14, 2024 1:05 PM
To: Michael S. Tsirkin
Cc: Greg KH; Adrian Vladu; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected] Subject: Re: [PATCH net] net: drop bad gso csum_start and offset in virtio_net_hdr
Quoted 150 lines · Michael S. Tsirkin
Quoted 130 lines · Christian Heusel
Quoted 114 lines · Christian Heusel
Quoted 30 lines · Greg KH
Quoted 27 lines · Christian Heusel
Quoted 12 lines · Greg KH
Quoted 7 lines · On Mon, Aug 05, 2024 at 09:28:29PM +0000, [email protected] wrote:
Hello,
This patch needs to be backported to the stable 6.1.x and 6.64.x branches, as the initial patch https://github.com/torvalds/linux/commit/e269d79c7d35aa3808b1f3c1737d63dab504ddc8 was backported a few days ago: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/linux/virtio_net.h?h=3Dv6.1.103&id=3D5b1997487a3f3373b0f580c8a20b56c1b64b0775
Quoted 7 lines
Please provide a working backport, the change does not properly
cherry-pick.
greg k-h
Hey Greg, hey Sasha,
Quoted 7 lines
Quoted 3 lines
this patch also needs backporting to the 6.6.y and 6.10.y series as the
buggy commit was backported to to all three series.
What buggy commit?
The issue is that commit
e269d79c7d35("net: missing check virtio")introduces a bug which is fixed by
89add40066f9("net: drop bad gso
csum_startand offset invirtio_net_hdr") which it also carries a"Fixes:" tag for.
Therefore it would be good to also get
89add40066f9backported.Quoted 3 lines
And how was this tested, it does not apply cleanly to the trees for me
at all.
I have tested this with the procedure as described in [0]:
$ git switch linux-6.10.y$ git cherry-pick -x 89add40066f9ed9abe5f7f886fe5789ff7e0c50eAuto-merging
net/ipv4/udp_offload.c[linux-6.10.y
fbc0d2bea065] net: drop bad gsocsum_startand offset invirtio_net_hdrAuthor: Willem de Bruijn <[email protected]>
Date: Mon Jul 29 16:10:12 2024 -0400
3 files changed, 12 insertions(+), 11 deletions(-)This also works for linux-6.6.y, but not for linux-6.1.y, as it fails
with a merge error there.
The relevant commit is confirmed to fix the issue in the relevant Githu
issue here[1]:
@marek22k commented
> They both fix the problem for me.
Quoted 1 line
confused,
Sorry for the confusion! I hope the above clears things up a little :)
Quoted 1 line
greg k-h
Cheers,
Quoted 7 lines
Christian
[0]: https://lore.kernel.org/all/2024060624-platinum-ladies-9214@gregkh/
[1]: https://github.com/tailscale/tailscale/issues/13041#issuecomment-2272326491
Since I didn't hear from anybody so far about the above issue it's a bit
unclear on how to proceed here. I still think that I would make sense to
Quoted 7 lines
go with my above suggestion about patching at least 2 out of the 3
stable series where the patch applies cleanly.
~ Chris
Do what Greg said:
Quoted 7 lines
Please provide a working backport, the change does not properly
cherry-pick.
that means, post backported patches to stable, copy list.
Alright, will do!
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
Have a nice day everybody :)
Cheers,
Chris
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in include/linux/virtio_net.h is resolved by first backporting commit fc8b2a6194693 ("net: more strict VIRTIO_NET_HDR_GSO_UDP_L4 validation")
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in net/ipv4/udp_offload.c is not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.
We can also avoid the backport of fc8b2a6194693 and construct a custom version for this older kernel. All this is needed in virtio_net.h is
+ case SKB_GSO_UDP_L4: + case SKB_GSO_TCPV4: + case SKB_GSO_TCPV6:
+ if (skb->csum_offset != offsetof(struct tcphdr, check))
and in __udp_gso_segment
+ if (unlikely(skb_checksum_start(gso_skb) !=
+ skb_transport_header(gso_skb)))
+ return ERR_PTR(-EINVAL);
+
The Fixes tag points to a commit introduced in 6.1. 6.6 is queued up, so this is the only release for which we have to create a custom patch, right?
Let me know if you will send this, or I should?
Willem,
Quoted 18 lines · Willem de Bruijn
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in
include/linux/virtio_net.his resolved by first backporting commitfc8b2a6194693("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")
Quoted 6 lines
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in
net/ipv4/udp_offload.cis not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.
BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in ALT, and there is no reported problems as of yet.
89add40066f9 ("net: drop bad gso csum_start and offset in virtio_net_hdr") fc8b2a619469 ("net: more strict VIRTIO_NET_HDR_GSO_UDP_L4 validation") 9840036786d9 ("gso: fix dodgy bit handling for GSO_UDP_L4")
[1] https://lore.kernel.org/all/2024081147-altitude-luminous-19d1@gregkh/
Thanks,
Quoted 22 lines
We can also avoid the backport of
fc8b2a6194693and construct a custom version for this older kernel. All this is needed invirtio_net.his(quoted diff) +4
-0+ case SKB_GSO_UDP_L4: + case SKB_GSO_TCPV4: + case SKB_GSO_TCPV6: + if (skb->csum_offset != offsetof(struct tcphdr, check))and in
__udp_gso_segment(quoted diff) +4
-0+ if (unlikely(skb_checksum_start(gso_skb) != + skb_transport_header(gso_skb))) + return ERR_PTR(-EINVAL); +The Fixes tag points to a commit introduced in 6.1. 6.6 is queued up, so this is the only release for which we have to create a custom patch, right?
Let me know if you will send this, or I should?
Quoted 28 lines · Vitaly Chikunov
Willem,
Quoted 18 lines · Willem de Bruijn
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in
include/linux/virtio_net.his resolved by first backporting commitfc8b2a6194693("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")Quoted 6 lines
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in
net/ipv4/udp_offload.cis not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.
Quoted 8 lines
BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in ALT, and there is no reported problems as of yet.
89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")[1] https://lore.kernel.org/all/2024081147-altitude-luminous-19d1@gregkh/
That's good to hear.
These are all fine to go to 6.1 stable.
Hi,
Quoted 36 lines · Willem de Bruijn
Quoted 35 lines · Vitaly Chikunov
Willem,
Quoted 18 lines · Willem de Bruijn
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in
include/linux/virtio_net.his resolved by first backporting commitfc8b2a6194693("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")Quoted 6 lines
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in
net/ipv4/udp_offload.cis not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in ALT, and there is no reported problems as of yet.
89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")
Quoted 5 lines
That's good to hear.
These are all fine to go to 6.1 stable.
FWIW, as we are hit by this issue for Debian bookworm, we have testing as well from David Prévot <[email protected]>, cf. the report in
https://bugs.debian.org/1079684 .
He mentions that the 9840036786d9 ("gso: fix dodgy bit handling for GSO_UDP_L4") patch does not apply cleanly, looks to be because of 1fd54773c267 ("udp: allow header check for dodgy GSO_UDP_L4 packets.") from 6.2-rc1, which are reverted in the commit.
Regards,
Salvatore
Salvatore Bonaccorso
Tested-byHi,
Quoted 45 lines · Salvatore Bonaccorso
Hi,
Quoted 36 lines · Willem de Bruijn
Quoted 35 lines · Vitaly Chikunov
Willem,
Quoted 18 lines · Willem de Bruijn
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in
include/linux/virtio_net.his resolved by first backporting commitfc8b2a6194693("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")Quoted 6 lines
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in
net/ipv4/udp_offload.cis not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in ALT, and there is no reported problems as of yet.
89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")Quoted 5 lines
That's good to hear.
These are all fine to go to 6.1 stable.
Quoted 8 lines
FWIW, as we are hit by this issue for Debian bookworm, we have testing as well from David Prévot <[email protected]>, cf. the report in
https://bugs.debian.org/1079684 .He mentions that the
9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4") patch does not apply cleanly, looks to be because of1fd54773c267("udp: allow header check for dodgyGSO_UDP_L4packets.") from 6.2-rc1, which are reverted in the commit.
Just to give an additional confirmation: Applying
1fd54773c267 ("udp: allow header check for dodgy GSO_UDP_L4 packets.") 9840036786d9 ("gso: fix dodgy bit handling for GSO_UDP_L4") fc8b2a619469 ("net: more strict VIRTIO_NET_HDR_GSO_UDP_L4 validation") 89add40066f9 ("net: drop bad gso csum_start and offset in virtio_net_hdr")
addresses the issue from
https://bugs.debian.org/1079684
matching
https://bugzilla.kernel.org/show_bug.cgi?id=219129
I tested it with the iperf3 based reproducers.
Regards,
Salvatore
Greg KH
maintainerQuoted 57 lines · Salvatore Bonaccorso
Hi,
Quoted 45 lines · Salvatore Bonaccorso
Hi,
Quoted 36 lines · Willem de Bruijn
Quoted 35 lines · Vitaly Chikunov
Willem,
Quoted 18 lines · Willem de Bruijn
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in
include/linux/virtio_net.his resolved by first backporting commitfc8b2a6194693("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")Quoted 6 lines
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in
net/ipv4/udp_offload.cis not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in ALT, and there is no reported problems as of yet.
89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")Quoted 5 lines
That's good to hear.
These are all fine to go to 6.1 stable.
Quoted 8 lines
FWIW, as we are hit by this issue for Debian bookworm, we have testing as well from David Prévot <[email protected]>, cf. the report in
https://bugs.debian.org/1079684 .He mentions that the
9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4") patch does not apply cleanly, looks to be because of1fd54773c267("udp: allow header check for dodgyGSO_UDP_L4packets.") from 6.2-rc1, which are reverted in the commit.
Quoted 6 lines
Just to give an additional confirmation: Applying
1fd54773c267("udp: allow header check for dodgyGSO_UDP_L4packets.")9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")
Ah, that works, thanks!
greg k-h
Quoted 53 lines · Greg KH
Quoted 52 lines · Salvatore Bonaccorso
Hi,
Quoted 49 lines · Salvatore Bonaccorso
Hi,
Quoted 36 lines · Willem de Bruijn
Quoted 35 lines · Vitaly Chikunov
Willem,
Quoted 18 lines · Willem de Bruijn
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in
include/linux/virtio_net.his resolved by first backporting commitfc8b2a6194693("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")Quoted 6 lines
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in
net/ipv4/udp_offload.cis not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in ALT, and there is no reported problems as of yet.
89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")Quoted 5 lines
That's good to hear.
These are all fine to go to 6.1 stable.
FWIW, as we are hit by this issue for Debian bookworm, we have testing as well from David Prévot <[email protected]>, cf. the report in
https://bugs.debian.org/1079684 .
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
He mentions that the
9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4") patch does not apply cleanly, looks to be because of1fd54773c267("udp: allow header check for dodgyGSO_UDP_L4packets.") from 6.2-rc1, which are reverted in the commit.Just to give an additional confirmation: Applying
1fd54773c267("udp: allow header check for dodgyGSO_UDP_L4packets.")
Interestingly, I don't need this commit cherry-picked when applying above patchset over v6.1.106 (with my git 2.42.2). It applies cleanly with two "Auto-merging" messages, then 2nd and 3rd hunks are not applied. It seems that 1fd54773c267 only adds the changes that following 9840036786d9 removes (in the 2nd and 3rd hunks). And the git is smart enough to figure that out and just don't apply them when cherry-picking. That explains why some commits that I say is apply cleanly some other people cannot apply.
Thanks,
Quoted 7 lines
Quoted 3 lines
9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")Ah, that works, thanks!
greg k-h
Greg KH
maintainerQuoted 36 lines · Willem de Bruijn
Quoted 35 lines · Vitaly Chikunov
Willem,
Quoted 18 lines · Willem de Bruijn
Quoted 10 lines · Christian Heusel
Quoted 5 lines · Adrian Vladu
Hello,
The 6.6.y branch has the patch already in the stable queue -> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=3e713b73c01fac163a5c8cb0953d1e300407a773, and it should be available in the 6.6.46 upcoming minor.
Thanks, Adrian.
Yeah it's also queued up for 6.10, which I both missed (sorry for that!). If I'm able to properly backport the patch for 6.1 I'll send that one, but my hopes are not too high that this will work ..
There are two conflicts.
The one in
include/linux/virtio_net.his resolved by first backporting commitfc8b2a6194693("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")Quoted 6 lines
We did not backport that to stable because there was some slight risk that applications might be affected. This has not surfaced.
The conflict in
net/ipv4/udp_offload.cis not so easy to address. There were lots of patches between v6.1 and linus/master, with far fewer of these betwee v6.1 and linux-stable/linux-6.1.y.BTW, we successfully cherry-picked 3 suggested[1] commits over v6.1.105 in ALT, and there is no reported problems as of yet.
89add40066f9("net: drop bad gsocsum_startand offset invirtio_net_hdr")fc8b2a619469("net: more strictVIRTIO_NET_HDR_GSO_UDP_L4validation")9840036786d9("gso: fix dodgy bit handling forGSO_UDP_L4")
Quoted 5 lines
That's good to hear.
These are all fine to go to 6.1 stable.
Can someone please send a series of backported patches to us so that we know exactly what to apply and in what order and why they need to be applied at all?
thanks,
greg k-h