Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d10f7717 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks 



[ Upstream commit 14695212d4cd8b0c997f6121b6df8520038ce076 ]

My intent was to not let users set a zero drop_batch_size,
it seems I once again messed with min()/max().

Fixes: 9d18562a ("fq_codel: add batch ability to fq_codel_drop()")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9667042c

net/sched/sch_fq_codel.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt, 
		q->quantum = max(256U, nla_get_u32(tb[TCA_FQ_CODEL_QUANTUM]));

		q->quantum = max(256U, nla_get_u32(tb[TCA_FQ_CODEL_QUANTUM]));





	if (tb[TCA_FQ_CODEL_DROP_BATCH_SIZE])

	if (tb[TCA_FQ_CODEL_DROP_BATCH_SIZE])

		q->drop_batch_size = min(1U, nla_get_u32(tb[TCA_FQ_CODEL_DROP_BATCH_SIZE]));

		q->drop_batch_size = max(1U, nla_get_u32(tb[TCA_FQ_CODEL_DROP_BATCH_SIZE]));





	if (tb[TCA_FQ_CODEL_MEMORY_LIMIT])

	if (tb[TCA_FQ_CODEL_MEMORY_LIMIT])

		q->memory_limit = min(1U << 31, nla_get_u32(tb[TCA_FQ_CODEL_MEMORY_LIMIT]));

		q->memory_limit = min(1U << 31, nla_get_u32(tb[TCA_FQ_CODEL_MEMORY_LIMIT]));