This is a note to let you know that I've just added the patch titled fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: fq_codel-fix-tca_fq_codel_drop_batch_size-sanity-checks.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Tue 12 May 2020 10:57:53 AM CEST From: Eric Dumazet <edumazet@xxxxxxxxxx> Date: Sat, 25 Apr 2020 12:40:25 -0700 Subject: fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks From: Eric Dumazet <edumazet@xxxxxxxxxx> [ 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: 9d18562a2278 ("fq_codel: add batch ability to fq_codel_drop()") Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx> Acked-by: Toke Høiland-Jørgensen <toke@xxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/sched/sch_fq_codel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -429,7 +429,7 @@ static int fq_codel_change(struct Qdisc q->quantum = max(256U, nla_get_u32(tb[TCA_FQ_CODEL_QUANTUM])); 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]) q->memory_limit = min(1U << 31, nla_get_u32(tb[TCA_FQ_CODEL_MEMORY_LIMIT])); Patches currently in stable-queue which might be from edumazet@xxxxxxxxxx are queue-4.19/net_sched-sch_skbprio-add-message-validation-to-skbprio_change.patch queue-4.19/sch_sfq-validate-silly-quantum-values.patch queue-4.19/fq_codel-fix-tca_fq_codel_drop_batch_size-sanity-checks.patch queue-4.19/sch_choke-avoid-potential-panic-in-choke_reset.patch