diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-18 08:55:36 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-18 09:39:41 +0200 |
| commit | 69747650c814a8a79fef412c7416adf823293a3e (patch) | |
| tree | c1c83e9ae903b0e93029f0071fdca544d2add340 /net/sched/sch_htb.c | |
| parent | pkt_sched: Fix missed RCU unlock in dev_queue_xmit() (diff) | |
| download | linux-69747650c814a8a79fef412c7416adf823293a3e.tar.xz linux-69747650c814a8a79fef412c7416adf823293a3e.zip | |
pkt_sched: Fix return value corruption in HTB and TBF.
Based upon a bug report by Josip Rodin.
Packet schedulers should only return NET_XMIT_DROP iff
the packet really was dropped. If the packet does reach
the device after we return NET_XMIT_DROP then TCP can
crash because it depends upon the enqueue path return
values being accurate.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 6febd245e62b..0df0df202ed0 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -577,7 +577,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch) sch->qstats.drops++; cl->qstats.drops++; } - return NET_XMIT_DROP; + return ret; } else { cl->bstats.packets += skb_is_gso(skb)?skb_shinfo(skb)->gso_segs:1; @@ -623,7 +623,7 @@ static int htb_requeue(struct sk_buff *skb, struct Qdisc *sch) sch->qstats.drops++; cl->qstats.drops++; } - return NET_XMIT_DROP; + return ret; } else htb_activate(q, cl); |