Files
linux/include/linux
Jonathan Davies 0f810d06b5 net: virtio_net_hdr_to_skb: count transport header in UFO
[ Upstream commit cf9acc90c8 ]

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.

Fixes: 6dd912f826 ("net: check untrusted gso_size at kernel entry")
Signed-off-by: Jonathan Davies <jonathan.davies@nutanix.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-11-25 09:48:39 +01:00
..
2021-09-02 22:49:16 +02:00
2021-07-21 19:54:21 -07:00
2021-02-02 00:16:57 +01:00
2021-09-20 12:43:34 +01:00
2021-06-03 14:04:18 -07:00
2020-06-16 14:19:57 +02:00
2021-01-23 14:57:21 +01:00
2021-08-29 14:47:42 +03:00
2021-05-06 19:24:11 -07:00
2021-10-07 16:51:57 +02:00
2021-04-14 16:30:30 +03:00
2021-05-24 21:13:05 -07:00
2021-08-16 10:50:32 -06:00
2021-01-24 14:27:17 +01:00
2021-02-26 09:41:03 -08:00
2021-04-08 16:04:20 -07:00
2021-09-08 15:32:35 -07:00
2021-01-21 14:06:00 -07:00
2021-08-26 16:52:03 -07:00
2021-07-20 09:20:49 -07:00
2021-09-07 21:17:28 +02:00
2021-03-22 03:57:39 +01:00
2021-08-26 15:32:28 -04:00
2020-12-10 12:42:59 -06:00
2021-07-27 11:00:36 +02:00
2021-09-06 07:20:56 -04:00
2021-04-12 15:04:23 +02:00
2020-11-16 16:31:41 +01:00
2021-06-25 19:57:01 -04:00
2021-07-26 15:09:44 +02:00
2021-07-27 20:11:45 +01:00
2021-07-27 20:11:44 +01:00
2021-09-03 09:58:13 -07:00
2020-07-24 17:12:41 -07:00
2021-02-11 13:24:44 -08:00
2021-08-05 11:46:42 +01:00
2020-08-04 21:02:38 -04:00
2020-12-02 22:10:35 -08:00
2021-04-30 11:20:40 -07:00
2020-11-23 14:16:55 +00:00
2021-08-16 21:26:33 -07:00
2020-09-16 08:54:53 -05:00
2020-11-24 16:47:48 +01:00
2021-07-15 10:13:49 -07:00
2021-07-27 17:05:06 +01:00
2021-08-19 09:02:55 +09:00
2021-07-27 09:29:15 +02:00
2021-01-21 16:16:10 +00:00
2021-06-01 10:29:21 +01:00
2021-02-26 09:41:03 -08:00
2020-09-04 09:25:20 -07:00
2021-09-23 11:01:12 -04:00
2021-11-18 19:15:51 +01:00
2021-05-12 20:11:17 +02:00
2021-06-17 13:09:27 -04:00
2021-06-15 17:46:57 +02:00
2021-07-01 11:06:02 -07:00
2021-06-29 10:53:53 -07:00
2021-07-01 11:06:05 -07:00
2021-08-23 13:19:12 +02:00
2021-11-18 19:17:02 +01:00
2020-07-01 10:49:02 +02:00
2021-09-17 13:52:17 +01:00
2021-02-26 09:40:59 -08:00
2021-02-03 19:05:50 +01:00
2021-06-16 17:20:40 -05:00
2021-07-06 10:37:46 -05:00
2020-08-31 12:52:33 -07:00
2021-07-20 06:55:20 -07:00
2021-06-07 14:11:47 -07:00
2021-01-24 14:27:17 +01:00
2021-08-18 22:08:24 +02:00
2021-03-06 12:40:22 +01:00
2021-02-26 09:41:03 -08:00
2021-09-02 21:38:56 +02:00
2021-10-07 16:51:57 +02:00
2020-12-03 11:20:52 +01:00
2021-01-16 23:19:26 +01:00
2021-08-17 17:50:51 +02:00
2021-03-18 12:58:27 -04:00
2020-12-10 16:17:15 +01:00
2020-12-10 10:45:36 +01:00
2021-05-10 16:03:35 -07:00
2021-08-06 13:41:48 -07:00
2021-08-19 09:02:55 +09:00
2021-06-24 15:49:32 +02:00
2021-11-21 13:44:12 +01:00
2021-07-01 11:06:03 -07:00
2020-10-30 21:57:04 +01:00
2021-07-27 12:17:21 +02:00
2021-07-27 12:12:08 +02:00
2021-02-13 17:17:53 +01:00
2021-09-08 15:32:35 -07:00
2021-03-30 17:06:49 -07:00
2020-11-09 18:39:36 +01:00
2021-09-15 09:22:35 -06:00
2020-07-04 09:35:36 -05:00
2020-09-10 14:03:31 -07:00
2020-08-19 14:13:20 +02:00
2021-01-21 16:16:10 +00:00
2021-08-10 11:50:55 -04:00
2021-02-09 12:15:07 +01:00
2021-08-11 06:44:24 -04:00
2021-01-21 14:06:00 -07:00
2021-03-30 13:42:33 -04:00
2021-01-24 14:27:17 +01:00
2021-02-08 22:58:55 +01:00