diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-10-18 18:16:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-19 21:12:36 +0200 |
| commit | e0ad032e144731a5928f2d75e91c2064ba1a764c (patch) | |
| tree | 0251c77f78c0d1b52918b25f3ab5141643474db8 /net/sched/sch_netem.c | |
| parent | net: netem: fix error path for corrupted GSO frames (diff) | |
| download | linux-e0ad032e144731a5928f2d75e91c2064ba1a764c.tar.xz linux-e0ad032e144731a5928f2d75e91c2064ba1a764c.zip | |
net: netem: correct the parent's backlog when corrupted packet was dropped
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>
Diffstat (limited to '')
| -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 942eb17f413c..42e557d48e4e 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -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; } |