Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net_sched: hfsc: Address reentrant enqueue adding class to eltree twice

Savino says:
"We are writing to report that this recent patch
(141d34391abbb315d68556b7c67ad97885407547) [1]
can be bypassed, and a UAF can still occur when HFSC is utilized with
NETEM.

The patch only checks the cl->cl_nactive field to determine whether
it is the first insertion or not [2], but this field is only
incremented by init_vf [3].

By using HFSC_RSC (which uses init_ed) [4], it is possible to bypass the
check and insert the class twice in the eltree.
Under normal conditions, this would lead to an infinite loop in
hfsc_dequeue for the reasons we already explained in this report [5].

However, if TBF is added as root qdisc and it is configured with a
very low rate,
it can be utilized to prevent packets from being dequeued.
This behavior can be exploited to perform subsequent insertions in the
HFSC eltree and cause a UAF."

To fix both the UAF and the infinite loop, with netem as an hfsc child,
check explicitly in hfsc_enqueue whether the class is already in the eltree
whenever the HFSC_RSC flag is set.

[1] https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=141d34391abbb315d68556b7c67ad97885407547
[2] https://elixir.bootlin.com/linux/v6.15-rc5/source/net/sched/sch_hfsc.c#L1572
[3] https://elixir.bootlin.com/linux/v6.15-rc5/source/net/sched/sch_hfsc.c#L677
[4] https://elixir.bootlin.com/linux/v6.15-rc5/source/net/sched/sch_hfsc.c#L1574
[5] https://lore.kernel.org/netdev/8DuRWwfqjoRDLDmBMlIfbrsZg9Gx50DHJc1ilxsEBNe2D6NMoigR_eIRIG0LOjMc3r10nUUZtArXx4oZBIdUfZQrwjcQhdinnMis_0G7VEk=@willsroot.io/T/#u

Fixes: 37d9cf1a3ce3 ("sched: Fix detection of empty queues in child qdiscs")
Reported-by: Savino Dicanosa <savy@syst3mfailure.io>
Reported-by: William Liu <will@willsroot.io>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Tested-by: Victor Nogueira <victor@mojatatu.com>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Link: https://patch.msgid.link/20250522181448.1439717-2-pctammela@mojatatu.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Pedro Tammela and committed by
Paolo Abeni
ac9fe7dd 67af4ec9

+8 -1
+8 -1
net/sched/sch_hfsc.c
··· 175 175 176 176 #define HT_INFINITY 0xffffffffffffffffULL /* infinite time value */ 177 177 178 + static bool cl_in_el_or_vttree(struct hfsc_class *cl) 179 + { 180 + return ((cl->cl_flags & HFSC_FSC) && cl->cl_nactive) || 181 + ((cl->cl_flags & HFSC_RSC) && !RB_EMPTY_NODE(&cl->el_node)); 182 + } 178 183 179 184 /* 180 185 * eligible tree holds backlogged classes being sorted by their eligible times. ··· 1045 1040 if (cl == NULL) 1046 1041 return -ENOBUFS; 1047 1042 1043 + RB_CLEAR_NODE(&cl->el_node); 1044 + 1048 1045 err = tcf_block_get(&cl->block, &cl->filter_list, sch, extack); 1049 1046 if (err) { 1050 1047 kfree(cl); ··· 1579 1572 sch->qstats.backlog += len; 1580 1573 sch->q.qlen++; 1581 1574 1582 - if (first && !cl->cl_nactive) { 1575 + if (first && !cl_in_el_or_vttree(cl)) { 1583 1576 if (cl->cl_flags & HFSC_RSC) 1584 1577 init_ed(cl, len); 1585 1578 if (cl->cl_flags & HFSC_FSC)