Skip to content

Commit 838fdc2

Browse files
committed
net/sched: Abort __tc_modify_qdisc if parent class does not exist
jira LE-4066 Rebuild_History Non-Buildable kernel-4.18.0-553.72.1.el8_10 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 0fda28f commit 838fdc2

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
@@ -337,17 +337,22 @@ struct Qdisc *qdisc_lookup_rcu(struct net_device *dev, u32 handle)
337337
return q;
338338
}
339339

340-
static struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid)
340+
static struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid,
341+
struct netlink_ext_ack *extack)
341342
{
342343
unsigned long cl;
343344
const struct Qdisc_class_ops *cops = p->ops->cl_ops;
344345

345-
if (cops == NULL)
346-
return NULL;
346+
if (cops == NULL) {
347+
NL_SET_ERR_MSG(extack, "Parent qdisc is not classful");
348+
return ERR_PTR(-EOPNOTSUPP);
349+
}
347350
cl = cops->find(p, classid);
348351

349-
if (cl == 0)
350-
return NULL;
352+
if (cl == 0) {
353+
NL_SET_ERR_MSG(extack, "Specified class not found");
354+
return ERR_PTR(-ENOENT);
355+
}
351356
return cops->leaf(p, cl);
352357
}
353358

@@ -1491,7 +1496,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
14911496
NL_SET_ERR_MSG(extack, "Failed to find qdisc with specified classid");
14921497
return -ENOENT;
14931498
}
1494-
q = qdisc_leaf(p, clid);
1499+
q = qdisc_leaf(p, clid, extack);
14951500
} else if (dev_ingress_queue(dev)) {
14961501
q = dev_ingress_queue(dev)->qdisc_sleeping;
14971502
}
@@ -1502,6 +1507,8 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
15021507
NL_SET_ERR_MSG(extack, "Cannot find specified qdisc on specified device");
15031508
return -ENOENT;
15041509
}
1510+
if (IS_ERR(q))
1511+
return PTR_ERR(q);
15051512

15061513
if (tcm->tcm_handle && q->handle != tcm->tcm_handle) {
15071514
NL_SET_ERR_MSG(extack, "Invalid handle");
@@ -1595,7 +1602,9 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
15951602
NL_SET_ERR_MSG(extack, "Failed to find specified qdisc");
15961603
return -ENOENT;
15971604
}
1598-
q = qdisc_leaf(p, clid);
1605+
q = qdisc_leaf(p, clid, extack);
1606+
if (IS_ERR(q))
1607+
return PTR_ERR(q);
15991608
} else if (dev_ingress_queue_create(dev)) {
16001609
q = dev_ingress_queue(dev)->qdisc_sleeping;
16011610
}

0 commit comments

Comments
 (0)