sch_sfq: validate silly quantum values
Subsystems (3)
PATCH 1/1 sch_sfq: validate silly quantum values
syzbot managed to set up sfq so that q->scaled_quantum was zero, triggering an infinite loop in sfq_dequeue()
More generally, we must only accept quantum between 1 and 2^18 - 7, meaning scaled_quantum must be in [1, 0x7FFF] range.
Otherwise, we also could have a loop in sfq_dequeue() if scaled_quantum happens to be 0x8000, since slot->allot could indefinitely switch between 0 and 0x8000.
--- net/sched/sch_sfq.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/sched/sch_sfq.c +9 -0
@@ -637,6 +637,15 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt)if (ctl->divisor && (!is_power_of_2 (ctl->divisor) || ctl->divisor >65536 ))return -EINVAL ; + +/* slot->allot is a short, make sure quantum is not too big. */ +if (ctl->quantum) { +unsigned int scaled =SFQ_ALLOT_SIZE (ctl->quantum); + +if (scaled <=0 || scaled >SHRT_MAX ) +return -EINVAL ; + } +if (ctl_v1 && !red_check_params (ctl_v1->qth_min, ctl_v1->qth_max, ctl_v1->Wlog))return -EINVAL ;
Signature · 1 line
2.26.2.303.gf8c07b1a785-goog
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Sun, 26 Apr 2020 18:19:07 -0700
Quoted 6 lines
syzbot managed to set up sfq so that
q->scaled_quantumwas zero, triggering an infinite loop insfq_dequeue()More generally, we must only accept quantum between 1 and 2^18 - 7, meaning
scaled_quantummust be in [1,0x7FFF] range.
Quoted 7 lines
Otherwise, we also could have a loop in
sfq_dequeue()ifscaled_quantumhappens to be0x8000, sinceslot->allotcould indefinitely switch between 0 and0x8000.Fixes eeaeb068f139 ("sch_sfq: allow big packets and be fair")Signed-off-by Eric Dumazet <[email protected]>Reported-by [email protected]
Applied and queued up for -stable, thanks Eric.