]> www.infradead.org Git - users/dwmw2/linux.git/commit
sch_htb: make htb_deactivate() idempotent
authorCong Wang <xiyou.wangcong@gmail.com>
Mon, 28 Apr 2025 23:29:54 +0000 (16:29 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 5 May 2025 20:51:32 +0000 (13:51 -0700)
commit3769478610135e82b262640252d90f6efb05be71
tree90bca0675da78c1108fd6fd67bd434deb4e387d9
parentebd297a2affadb6f6f4d2e5d975c1eda18ac762d
sch_htb: make htb_deactivate() idempotent

Alan reported a NULL pointer dereference in htb_next_rb_node()
after we made htb_qlen_notify() idempotent.

It turns out in the following case it introduced some regression:

htb_dequeue_tree():
  |-> fq_codel_dequeue()
    |-> qdisc_tree_reduce_backlog()
      |-> htb_qlen_notify()
        |-> htb_deactivate()
  |-> htb_next_rb_node()
  |-> htb_deactivate()

For htb_next_rb_node(), after calling the 1st htb_deactivate(), the
clprio[prio]->ptr could be already set to  NULL, which means
htb_next_rb_node() is vulnerable here.

For htb_deactivate(), although we checked qlen before calling it, in
case of qlen==0 after qdisc_tree_reduce_backlog(), we may call it again
which triggers the warning inside.

To fix the issues here, we need to:

1) Make htb_deactivate() idempotent, that is, simply return if we
   already call it before.
2) Make htb_next_rb_node() safe against ptr==NULL.

Many thanks to Alan for testing and for the reproducer.

Fixes: 5ba8b837b522 ("sch_htb: make htb_qlen_notify() idempotent")
Reported-by: Alan J. Wylie <alan@wylie.me.uk>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Link: https://patch.msgid.link/20250428232955.1740419-2-xiyou.wangcong@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/sched/sch_htb.c