]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: netem: correct the parent's backlog when corrupted packet was dropped
authorJakub Kicinski <jakub.kicinski@netronome.com>
Fri, 18 Oct 2019 16:16:58 +0000 (09:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Oct 2019 19:12:36 +0000 (12:12 -0700)
If packet corruption failed we jump to finish_segs and return
NET_XMIT_SUCCESS. Seeing success will make the parent qdisc
increment its backlog, that's incorrect - we need to return
NET_XMIT_DROP.

Fixes: 46e48adc14a3 ("netem: Segment GSO packets on enqueue")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_netem.c

index 942eb17f413c48309de85511f54d7813ecb9475e..42e557d48e4e3f85ef9f6edc3c3bbe3c4df6eacd 100644 (file)
@@ -616,6 +616,8 @@ finish_segs:
                }
                /* Parent qdiscs accounted for 1 skb of size @prev_len */
                qdisc_tree_reduce_backlog(sch, -(nb - 1), -(len - prev_len));
+       } else if (!skb) {
+               return NET_XMIT_DROP;
        }
        return NET_XMIT_SUCCESS;
 }