virtio_net_hdr_to_skb does not set the skb's gso_size and gso_type correctly for UFO packets received via virtio-net that are a little over the GSO size. This can lead to problems elsewhere in the networking stack, e.g. ovs_vport_send dropping over-sized packets if gso_size is not set. This is due to the comparison if (skb->len - p_off > gso_size) not properly accounting for the transport layer header. p_off includes the size of the transport layer header (thlen), so skb->len - p_off is the size of the TCP/UDP payload. gso_size is read from the virtio-net header. For UFO, fragmentation happens at the IP level so does not need to include the UDP header. Hence the calculation could be comparing a TCP/UDP payload length with an IP payload length, causing legitimate virtio-net packets to have lack gso_type/gso_size information. Example: a UDP packet with payload size 1473 has IP payload size 1481. If the guest used UFO, it is not fragmented and the virtio-net header's flags indicate that it is a GSO frame (VIRTIO_NET_HDR_GSO_UDP), with gso_size = 1480 for an MTU of 1500. skb->len will be 1515 and p_off will be 42, so skb->len - p_off = 1473. Hence the comparison fails, and shinfo->gso_size and gso_type are not set as they should be. Instead, add the UDP header length before comparing to gso_size when using UFO. In this way, it is the size of the IP payload that is compared to gso_size.
Unified · Split
| @@ -120,10 +120,15 @@ retry: · 119 unmodified lines | ||
| 120 | 120 | |
| 121 | 121 | if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) { |
| 122 | 122 | u16 gso_size = __virtio16_to_cpu(little_endian, hdr->gso_size); |
| 123 | + unsigned int nh_off = p_off; | |
| 123 | 124 | struct skb_shared_info *shinfo = skb_shinfo(skb); |
| 124 | 125 | |
| 126 | + /* UFO may not include transport header in gso_size. */ | |
| 127 | + if (gso_type & SKB_GSO_UDP) | |
| 128 | + nh_off -= thlen; | |
| 129 | + | |
| 125 | 130 | /* Too small packets are not really GSO ones. */ |
| 126 | − if (skb->len - p_off > gso_size) { | |
| 131 | + if (skb->len - nh_off > gso_size) { | |
| 127 | 132 | shinfo->gso_size = gso_size; |
| 128 | 133 | shinfo->gso_type = gso_type; |
| 129 | 134 | |