Skip to content

Commit 103406b

Browse files
Lion Ackermannkuba-moo
authored andcommitted
net/sched: Always pass notifications when child class becomes empty
Certain classful qdiscs may invoke their classes' dequeue handler on an enqueue operation. This may unexpectedly empty the child qdisc and thus make an in-flight class passive via qlen_notify(). Most qdiscs do not expect such behaviour at this point in time and may re-activate the class eventually anyways which will lead to a use-after-free. The referenced fix commit attempted to fix this behavior for the HFSC case by moving the backlog accounting around, though this turned out to be incomplete since the parent's parent may run into the issue too. The following reproducer demonstrates this use-after-free: tc qdisc add dev lo root handle 1: drr tc filter add dev lo parent 1: basic classid 1:1 tc class add dev lo parent 1: classid 1:1 drr tc qdisc add dev lo parent 1:1 handle 2: hfsc def 1 tc class add dev lo parent 2: classid 2:1 hfsc rt m1 8 d 1 m2 0 tc qdisc add dev lo parent 2:1 handle 3: netem tc qdisc add dev lo parent 3:1 handle 4: blackhole echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 tc class delete dev lo classid 1:1 echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 Since backlog accounting issues leading to a use-after-frees on stale class pointers is a recurring pattern at this point, this patch takes a different approach. Instead of trying to fix the accounting, the patch ensures that qdisc_tree_reduce_backlog always calls qlen_notify when the child qdisc is empty. This solves the problem because deletion of qdiscs always involves a call to qdisc_reset() and / or qdisc_purge_queue() which ultimately resets its qlen to 0 thus causing the following qdisc_tree_reduce_backlog() to report to the parent. Note that this may call qlen_notify on passive classes multiple times. This is not a problem after the recent patch series that made all the classful qdiscs qlen_notify() handlers idempotent. Fixes: 3f98113 ("sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue()") Signed-off-by: Lion Ackermann <[email protected]> Reviewed-by: Jamal Hadi Salim <[email protected]> Acked-by: Cong Wang <[email protected]> Acked-by: Jamal Hadi Salim <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 561aa0e commit 103406b

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

net/sched/sch_api.c

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -780,15 +780,12 @@ static u32 qdisc_alloc_handle(struct net_device *dev)
780780

781781
void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)
782782
{
783-
bool qdisc_is_offloaded = sch->flags & TCQ_F_OFFLOADED;
784783
const struct Qdisc_class_ops *cops;
785784
unsigned long cl;
786785
u32 parentid;
787786
bool notify;
788787
int drops;
789788

790-
if (n == 0 && len == 0)
791-
return;
792789
drops = max_t(int, n, 0);
793790
rcu_read_lock();
794791
while ((parentid = sch->parent)) {
@@ -797,17 +794,8 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)
797794

798795
if (sch->flags & TCQ_F_NOPARENT)
799796
break;
800-
/* Notify parent qdisc only if child qdisc becomes empty.
801-
*
802-
* If child was empty even before update then backlog
803-
* counter is screwed and we skip notification because
804-
* parent class is already passive.
805-
*
806-
* If the original child was offloaded then it is allowed
807-
* to be seem as empty, so the parent is notified anyway.
808-
*/
809-
notify = !sch->q.qlen && !WARN_ON_ONCE(!n &&
810-
!qdisc_is_offloaded);
797+
/* Notify parent qdisc only if child qdisc becomes empty. */
798+
notify = !sch->q.qlen;
811799
/* TODO: perform the search on a per txq basis */
812800
sch = qdisc_lookup_rcu(qdisc_dev(sch), TC_H_MAJ(parentid));
813801
if (sch == NULL) {
@@ -816,6 +804,9 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)
816804
}
817805
cops = sch->ops->cl_ops;
818806
if (notify && cops->qlen_notify) {
807+
/* Note that qlen_notify must be idempotent as it may get called
808+
* multiple times.
809+
*/
819810
cl = cops->find(sch, parentid);
820811
cops->qlen_notify(sch, cl);
821812
}

0 commit comments

Comments
 (0)