diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-10-18 09:16:58 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-12-19 15:58:40 +0000 |
| commit | 369851be561fe115c026df020e6beb2bc01f27db (patch) | |
| tree | 3c04ab8493901dab48a58f4426e89a79e39feb4a | |
| parent | 4f1c4a3446654e79dad3dcfe5a984c984c70316d (diff) | |
| download | linux-stable-369851be561fe115c026df020e6beb2bc01f27db.tar.gz linux-stable-369851be561fe115c026df020e6beb2bc01f27db.tar.bz2 linux-stable-369851be561fe115c026df020e6beb2bc01f27db.zip | |
net: netem: correct the parent's backlog when corrupted packet was dropped
commit e0ad032e144731a5928f2d75e91c2064ba1a764c upstream.
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: 6071bd1aa13e ("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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/sched/sch_netem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 95df63bca928..a53cee11dec5 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -599,6 +599,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; } |