Skip to content

Commit 758d463

Browse files
edumazetSasha Levin
authored andcommitted
net_sched: ets: fix a race in ets_qdisc_change()
[ Upstream commit d92adac ] Gerrard Tai reported a race condition in ETS, 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: b05972f ("net: sched: tbf: don't call qdisc_put() while holding tree lock") 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-5-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent beb789e commit 758d463

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/sched/sch_ets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt,
661661
for (i = q->nbands; i < oldbands; i++) {
662662
if (i >= q->nstrict && q->classes[i].qdisc->q.qlen)
663663
list_del_init(&q->classes[i].alist);
664-
qdisc_tree_flush_backlog(q->classes[i].qdisc);
664+
qdisc_purge_queue(q->classes[i].qdisc);
665665
}
666666
WRITE_ONCE(q->nstrict, nstrict);
667667
memcpy(q->prio2band, priomap, sizeof(priomap));

0 commit comments

Comments
 (0)