net: avoid false positives in untrusted gso validation
Subsystems (4)
PATCH 1/1 net: avoid false positives in untrusted gso validation
From: Willem de Bruijn <[email protected]>
GSO packets with vnet_hdr must conform to a small set of gso_types. The below commit uses flow dissection to drop packets that do not.
But it has false positives when the skb is not fully initialized. Dissection needs skb->protocol and skb->network_header.
Infer skb->protocol from gso_type as the two must agree. SKB_GSO_UDP can use both ipv4 and ipv6, so try both.
Exclude callers for which network header offset is not known.
--- include/linux/virtio_net.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
include/linux/virtio_net.h +12 -2
@@ -61,10 +61,20 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,/* gso packets without NEEDS_CSUM do not set transport_offset. * probe and drop if does not match one of the above types. */ -if (gso_type) { +if (gso_type && skb->network_header) { +if (!skb->protocol) +virtio_net_hdr_set_proto (skb, hdr); +retry:skb_probe_transport_header (skb,-1 ); -if (!skb_transport_header_was_set (skb)) +if (!skb_transport_header_was_set (skb)) { +/* UFO does not specify ipv4 or 6: try both */ +if (gso_type &SKB_GSO_UDP && + skb->protocol ==htons (ETH_P_IP )) { + skb->protocol =htons (ETH_P_IPV6 ); + goto retry; + }return -EINVAL ; + } } }
Signature · 1 line
2.21.0.rc0.258.g878e2cd30e-goog
David Miller
maintainerFrom: Willem de Bruijn <[email protected]>
Date: Mon, 18 Feb 2019 23:37:12 -0500
Quoted 8 lines
From: Willem de Bruijn <[email protected]>
GSO packets with
vnet_hdrmust conform to a small set ofgso_types. The below commit uses flow dissection to drop packets that do not.But it has false positives when the skb is not fully initialized. Dissection needs
skb->protocolandskb->network_header.
Quoted 7 lines
Infer
skb->protocolfromgso_typeas the two must agree.SKB_GSO_UDPcan use both ipv4 and ipv6, so try both.Exclude callers for which network header offset is not known.
Fixes d5be7f632bad ("net: validate untrusted gso packets without csum offload")Signed-off-by Willem de Bruijn <[email protected]>
Applied and queued up for -stable, thanks.