diff options
| author | Kenneth Klette Jonassen <kennetkl@ifi.uio.no> | 2015-02-03 17:49:18 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-09-18 12:47:06 +0200 |
| commit | fa0268659d6f2f10b1e90cd14ef59a7860a37c8b (patch) | |
| tree | d1458fa768ebd27c19f660c8991ada6c0552d10b /net/sched | |
| parent | 2afc063b1f9803b0f86f884176aef7365563a845 (diff) | |
pkt_sched: fq: avoid hang when quantum 0
Configuring fq with quantum 0 hangs the system, presumably because of a
non-interruptible infinite loop. Either way quantum 0 does not make sense.
Reproduce with:
sudo tc qdisc add dev lo root fq quantum 0 initial_quantum 0
ping 127.0.0.1
Signed-off-by: Kenneth Klette Jonassen <kennetkl@ifi.uio.no>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_fq.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index 1828c0d4e..1c88dd89b 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c @@ -675,8 +675,14 @@ static int fq_change(struct Qdisc *sch, struct nlattr *opt) if (tb[TCA_FQ_FLOW_PLIMIT]) q->flow_plimit = nla_get_u32(tb[TCA_FQ_FLOW_PLIMIT]); - if (tb[TCA_FQ_QUANTUM]) - q->quantum = nla_get_u32(tb[TCA_FQ_QUANTUM]); + if (tb[TCA_FQ_QUANTUM]) { + u32 quantum = nla_get_u32(tb[TCA_FQ_QUANTUM]); + + if (quantum > 0) + q->quantum = quantum; + else + err = -EINVAL; + } if (tb[TCA_FQ_INITIAL_QUANTUM]) q->initial_quantum = nla_get_u32(tb[TCA_FQ_INITIAL_QUANTUM]); |