Skip to content

Commit 47ec3f8

Browse files
committed
sch_htb: make htb_qlen_notify() idempotent
jira LE-3834 cve CVE-2025-38350 Rebuild_History Non-Buildable kernel-5.14.0-570.33.2.el9_6 commit-author Cong Wang <[email protected]> commit 5ba8b83 htb_qlen_notify() always deactivates the HTB class and in fact could trigger a warning if it is already deactivated. Therefore, it is not idempotent and not friendly to its callers, like fq_codel_dequeue(). Let's make it idempotent to ease qdisc_tree_reduce_backlog() callers' life. Reported-by: Gerrard Tai <[email protected]> Signed-off-by: Cong Wang <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Acked-by: Jamal Hadi Salim <[email protected]> Signed-off-by: Paolo Abeni <[email protected]> (cherry picked from commit 5ba8b83) Signed-off-by: Jonathan Maple <[email protected]>
1 parent a31a4fc commit 47ec3f8

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

net/sched/sch_htb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,6 +1486,8 @@ static void htb_qlen_notify(struct Qdisc *sch, unsigned long arg)
14861486
{
14871487
struct htb_class *cl = (struct htb_class *)arg;
14881488

1489+
if (!cl->prio_activity)
1490+
return;
14891491
htb_deactivate(qdisc_priv(sch), cl);
14901492
}
14911493

0 commit comments

Comments
 (0)