Skip to content

Commit 40f3009

Browse files
committed
net/sched: Abort __tc_modify_qdisc if parent class does not exist
jira LE-4076 Rebuild_History Non-Buildable kernel-6.12.0-55.29.1.el10_0 commit-author Victor Nogueira <victor@mojatatu.com> commit ffdde7b Lion's patch [1] revealed an ancient bug in the qdisc API. Whenever a user creates/modifies a qdisc specifying as a parent another qdisc, the qdisc API will, during grafting, detect that the user is not trying to attach to a class and reject. However grafting is performed after qdisc_create (and thus the qdiscs' init callback) is executed. In qdiscs that eventually call qdisc_tree_reduce_backlog during init or change (such as fq, hhf, choke, etc), an issue arises. For example, executing the following commands: sudo tc qdisc add dev lo root handle a: htb default 2 sudo tc qdisc add dev lo parent a: handle beef fq Qdiscs such as fq, hhf, choke, etc unconditionally invoke qdisc_tree_reduce_backlog() in their control path init() or change() which then causes a failure to find the child class; however, that does not stop the unconditional invocation of the assumed child qdisc's qlen_notify with a null class. All these qdiscs make the assumption that class is non-null. The solution is ensure that qdisc_leaf() which looks up the parent class, and is invoked prior to qdisc_create(), should return failure on not finding the class. In this patch, we leverage qdisc_leaf to return ERR_PTRs whenever the parentid doesn't correspond to a class, so that we can detect it earlier on and abort before qdisc_create is called. [1] https://lore.kernel.org/netdev/d912cbd7-193b-4269-9857-525bee8bbb6a@gmail.com/ Fixes: 5e50da0 ("[NET_SCHED]: Fix endless loops (part 2): "simple" qdiscs") Reported-by: syzbot+d8b58d7b0ad89a678a16@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/68663c93.a70a0220.5d25f.0857.GAE@google.com/ Reported-by: syzbot+5eccb463fa89309d8bdc@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/68663c94.a70a0220.5d25f.0858.GAE@google.com/ Reported-by: syzbot+1261670bbdefc5485a06@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/686764a5.a00a0220.c7b3.0013.GAE@google.com/ Reported-by: syzbot+15b96fc3aac35468fe77@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/686764a5.a00a0220.c7b3.0014.GAE@google.com/ Reported-by: syzbot+4dadc5aecf80324d5a51@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/68679e81.a70a0220.29cf51.0016.GAE@google.com/ Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Reviewed-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Victor Nogueira <victor@mojatatu.com> Link: https://patch.msgid.link/20250707210801.372995-1-victor@mojatatu.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit ffdde7b) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent d4dbaef commit 40f3009

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

net/sched/sch_api.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,17 +334,22 @@ struct Qdisc *qdisc_lookup_rcu(struct net_device *dev, u32 handle)
334334
return q;
335335
}
336336

337-
static struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid)
337+
static struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid,
338+
struct netlink_ext_ack *extack)
338339
{
339340
unsigned long cl;
340341
const struct Qdisc_class_ops *cops = p->ops->cl_ops;
341342

342-
if (cops == NULL)
343-
return NULL;
343+
if (cops == NULL) {
344+
NL_SET_ERR_MSG(extack, "Parent qdisc is not classful");
345+
return ERR_PTR(-EOPNOTSUPP);
346+
}
344347
cl = cops->find(p, classid);
345348

346-
if (cl == 0)
347-
return NULL;
349+
if (cl == 0) {
350+
NL_SET_ERR_MSG(extack, "Specified class not found");
351+
return ERR_PTR(-ENOENT);
352+
}
348353
return cops->leaf(p, cl);
349354
}
350355

@@ -1535,7 +1540,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
15351540
NL_SET_ERR_MSG(extack, "Failed to find qdisc with specified classid");
15361541
return -ENOENT;
15371542
}
1538-
q = qdisc_leaf(p, clid);
1543+
q = qdisc_leaf(p, clid, extack);
15391544
} else if (dev_ingress_queue(dev)) {
15401545
q = rtnl_dereference(dev_ingress_queue(dev)->qdisc_sleeping);
15411546
}
@@ -1546,6 +1551,8 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
15461551
NL_SET_ERR_MSG(extack, "Cannot find specified qdisc on specified device");
15471552
return -ENOENT;
15481553
}
1554+
if (IS_ERR(q))
1555+
return PTR_ERR(q);
15491556

15501557
if (tcm->tcm_handle && q->handle != tcm->tcm_handle) {
15511558
NL_SET_ERR_MSG(extack, "Invalid handle");
@@ -1639,7 +1646,9 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
16391646
NL_SET_ERR_MSG(extack, "Failed to find specified qdisc");
16401647
return -ENOENT;
16411648
}
1642-
q = qdisc_leaf(p, clid);
1649+
q = qdisc_leaf(p, clid, extack);
1650+
if (IS_ERR(q))
1651+
return PTR_ERR(q);
16431652
} else if (dev_ingress_queue_create(dev)) {
16441653
q = rtnl_dereference(dev_ingress_queue(dev)->qdisc_sleeping);
16451654
}

0 commit comments

Comments
 (0)