net: Skip GSO length estimation if transport header is not set
authorMaxim Mikityanskiy <maximmi@mellanox.com>
Fri, 22 Feb 2019 12:55:22 +0000 (12:55 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 24 Feb 2019 20:40:38 +0000 (12:40 -0800)
qdisc_pkt_len_init expects transport_header to be set for GSO packets.
Patch [1] skips transport_header validation for GSO packets that don't
have network_header set at the moment of calling virtio_net_hdr_to_skb,
and allows them to pass into the stack. After patch [2] no placeholder
value is assigned to transport_header if dissection fails, so this patch
adds a check to the place where the value of transport_header is used.

[1] https://patchwork.ozlabs.org/patch/1044429/
[2] https://patchwork.ozlabs.org/patch/1046122/

Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index a3d13f5..8a0da95 100644 (file)
@@ -3421,7 +3421,7 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
        /* To get more precise estimation of bytes sent on wire,
         * we add to pkt_len the headers size of all segments
         */
-       if (shinfo->gso_size {
+       if (shinfo->gso_size && skb_transport_header_was_set(skb)) {
                unsigned int hdr_len;
                u16 gso_segs = shinfo->gso_segs;