public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: jhs@mojatatu.com, jiri@resnulli.us, edumazet@google.com,
	gerrard.tai@starlabs.sg, Cong Wang <xiyou.wangcong@gmail.com>
Subject: [Patch net 00/12] net_sched: make ->qlen_notify() idempotent
Date: Thu, 20 Mar 2025 16:21:59 -0700	[thread overview]
Message-ID: <20250320232211.485785-1-xiyou.wangcong@gmail.com> (raw)

Gerrard reported a vulnerability exists in fq_codel where manipulating
the MTU can cause codel_dequeue() to drop all packets. The parent qdisc's
sch->q.qlen is only updated via ->qlen_notify() if the fq_codel queue
remains non-empty after the drops. This discrepancy in qlen between
fq_codel and its parent can lead to a use-after-free condition.

Let's fix this by making all existing ->qlen_notify() idempotent so that
the sch->q.qlen check is no longer necessary.

Patch 1~5 make all existing ->qlen_notify() idempotent to prepare for
patch 6 which removes the sch->q.qlen check. They are followed by 6
selftests for each type of Qdisc's we touch here.

All existing and new Qdisc selftests pass after this patchset.

Fixes: 4b549a2ef4be ("fq_codel: Fair Queue Codel AQM")
Fixes: 76e3cc126bb2 ("codel: Controlled Delay AQM")

---
Cong Wang (12):
  sch_htb: make htb_qlen_notify() idempotent
  sch_drr: make drr_qlen_notify() idempotent
  sch_hfsc: make hfsc_qlen_notify() idempotent
  sch_qfq: make qfq_qlen_notify() idempotent
  sch_ets: make est_qlen_notify() idempotent
  codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
  selftests/tc-testing: Add a test case for FQ_CODEL with HTB parent
  selftests/tc-testing: Add a test case for CODEL with HTB parent
  selftests/tc-testing: Add a test case for FQ_CODEL with QFQ parent
  selftests/tc-testing: Add a test case for FQ_CODEL with HFSC parent
  selftests/tc-testing: Add a test case for FQ_CODEL with DRR parent
  selftests/tc-testing: Add a test case for FQ_CODEL with ETS parent

 net/sched/sch_codel.c                         |   5 +-
 net/sched/sch_drr.c                           |   7 +-
 net/sched/sch_ets.c                           |   8 +-
 net/sched/sch_fq_codel.c                      |   6 +-
 net/sched/sch_hfsc.c                          |   8 +-
 net/sched/sch_htb.c                           |   2 +
 net/sched/sch_qfq.c                           |   7 +-
 .../tc-testing/tc-tests/infra/qdiscs.json     | 188 +++++++++++++++++-
 8 files changed, 211 insertions(+), 20 deletions(-)

-- 
2.34.1


             reply	other threads:[~2025-03-20 23:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-20 23:21 Cong Wang [this message]
2025-03-20 23:25 ` [Patch net 01/12] sch_htb: make htb_qlen_notify() idempotent Cong Wang
2025-03-20 23:25   ` [Patch net 02/12] sch_drr: make drr_qlen_notify() idempotent Cong Wang
2025-03-20 23:25   ` [Patch net 03/12] sch_hfsc: make hfsc_qlen_notify() idempotent Cong Wang
2025-03-20 23:25   ` [Patch net 04/12] sch_qfq: make qfq_qlen_notify() idempotent Cong Wang
2025-03-20 23:25   ` [Patch net 05/12] sch_ets: make est_qlen_notify() idempotent Cong Wang
2025-03-20 23:25   ` [Patch net 06/12] codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() Cong Wang
2025-03-20 23:25   ` [Patch net 07/12] selftests/tc-testing: Add a test case for FQ_CODEL with HTB parent Cong Wang
2025-03-20 23:25   ` [Patch net 08/12] selftests/tc-testing: Add a test case for CODEL " Cong Wang
2025-03-23 22:48     ` Victor Nogueira
2025-03-28 20:35       ` Cong Wang
2025-03-30 21:05         ` Victor Nogueira
2025-03-30 23:32           ` Cong Wang
2025-04-03  0:40             ` Cong Wang
2025-04-03  1:23               ` Victor Nogueira
2025-04-03 19:32                 ` Cong Wang
2025-03-20 23:25   ` [Patch net 09/12] selftests/tc-testing: Add a test case for FQ_CODEL with QFQ parent Cong Wang
2025-03-20 23:25   ` [Patch net 10/12] selftests/tc-testing: Add a test case for FQ_CODEL with HFSC parent Cong Wang
2025-03-20 23:25   ` [Patch net 11/12] selftests/tc-testing: Add a test case for FQ_CODEL with DRR parent Cong Wang
2025-03-20 23:25   ` [Patch net 12/12] selftests/tc-testing: Add a test case for FQ_CODEL with ETS parent Cong Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250320232211.485785-1-xiyou.wangcong@gmail.com \
    --to=xiyou.wangcong@gmail.com \
    --cc=edumazet@google.com \
    --cc=gerrard.tai@starlabs.sg \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox