]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net_sched: red: fix a race in __red_change()
authorEric Dumazet <edumazet@google.com>
Wed, 11 Jun 2025 11:15:12 +0000 (11:15 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jun 2025 13:32:31 +0000 (15:32 +0200)
[ Upstream commit 85a3e0ede38450ea3053b8c45d28cf55208409b8 ]

Gerrard Tai reported a race condition in RED, whenever SFQ perturb timer
fires at the wrong time.

The race is as follows:

CPU 0                                 CPU 1
[1]: lock root
[2]: qdisc_tree_flush_backlog()
[3]: unlock root
 |
 |                                    [5]: lock root
 |                                    [6]: rehash
 |                                    [7]: qdisc_tree_reduce_backlog()
 |
[4]: qdisc_put()

This can be abused to underflow a parent's qlen.

Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog()
should fix the race, because all packets will be purged from the qdisc
before releasing the lock.

Fixes: 0c8d13ac9607 ("net: sched: red: delay destroying child qdisc on replace")
Reported-by: Gerrard Tai <gerrard.tai@starlabs.sg>
Suggested-by: Gerrard Tai <gerrard.tai@starlabs.sg>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250611111515.1983366-3-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/sched/sch_red.c

index b5f096588fae6ead0743bf1c811bfd3b7b7430b1..0f0701ed397e90b6faadd45e035cd5b799d8649d 100644 (file)
@@ -283,7 +283,7 @@ static int __red_change(struct Qdisc *sch, struct nlattr **tb,
        q->userbits = userbits;
        q->limit = ctl->limit;
        if (child) {
-               qdisc_tree_flush_backlog(q->qdisc);
+               qdisc_purge_queue(q->qdisc);
                old_child = q->qdisc;
                q->qdisc = child;
        }