Skip to contentSkip to conversation

net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle

PATCH Applied Jamal Hadi Salim 2 participants 3 messages Jun 20 – Jun 24

Subsystems (3)
lore
Share & tools
lore

Jamal Hadi Salim

author maintainer
#0 lore raw

PATCH 1/1 net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle

tcf_classify() can return TC_ACT_CONSUMED while the skb is held by the defragmentation engine (e.g. act_ct on out-of-order fragments). When that happens the skb is no longer owned by the caller and must not be touched again.

tcf_qevent_handle() did not handle TC_ACT_CONSUMED: it fell through the switch and returned the skb to the caller as if classification had passed. The only qdisc that wires up qevents today is RED, via three call sites (qe_mark on RED_PROB_MARK/HARD_MARK, qe_early_drop on congestion_drop) red_enqueue() was continuing to operate on an skb it no longer owns in this case -- enqueueing it, dropping it, or updating statistics. Resulting in a UAF.

tc qdisc add dev eth0 root handle 1: red ... qevent early_drop block 10 tc filter add block 10 ... action ct

(with ct defrag enabled and traffic that produces out-of-order fragments, e.g. a fragmented UDP stream)

Handle TC_ACT_CONSUMED in tcf_qevent_handle() the same way the ingress and egress fast paths do: treat it as stolen and return NULL without touching the skb. Unlike the TC_ACT_STOLEN case, the skb must not be dropped/freed here, as it is no longer owned by us.

Fixes 3f14b377d01d ("net/sched: act_ct: fix skb leak and crash on ooo frags")
---
 net/sched/cls_api.c | 3 +++
 1 file changed, 3 insertions(+)
net/sched/cls_api.c +3 -0
index 20f7f9ee0b353..3e67600a4a1a1 100644
@@ -4049,6 +4049,9 @@ struct sk_buff *tcf_qevent_handle(struct tcf_qevent *qe, struct Qdisc *sch, stru
 		skb_do_redirect(skb);
 		*ret = __NET_XMIT_STOLEN;
 		return NULL;
+	case TC_ACT_CONSUMED:
+		*ret = __NET_XMIT_STOLEN;
+		return NULL;
 	}
 
 	return skb;
Signature · 1 line
2.34.1
author maintainer
#1 lore raw
Quoted 16 lines · Jamal Hadi Salim

tcf_classify() can return TC_ACT_CONSUMED while the skb is held by the defragmentation engine (e.g. act_ct on out-of-order fragments). When that happens the skb is no longer owned by the caller and must not be touched again.

tcf_qevent_handle() did not handle TC_ACT_CONSUMED: it fell through the switch and returned the skb to the caller as if classification had passed. The only qdisc that wires up qevents today is RED, via three call sites (qe_mark on RED_PROB_MARK/HARD_MARK, qe_early_drop on congestion_drop) red_enqueue() was continuing to operate on an skb it no longer owns in this case -- enqueueing it, dropping it, or updating statistics. Resulting in a UAF.

tc qdisc add dev eth0 root handle 1: red ... qevent early_drop block 10 tc filter add block 10 ... action ct

Quoted 8 lines

(with ct defrag enabled and traffic that produces out-of-order fragments, e.g. a fragmented UDP stream)

Handle TC_ACT_CONSUMED in tcf_qevent_handle() the same way the ingress and egress fast paths do: treat it as stolen and return NULL without touching the skb. Unlike the TC_ACT_STOLEN case, the skb must not be dropped/freed here, as it is no longer owned by us.

I just looked at sashiko claims - one of them (on ebpf) is legit but the one on qdiscs is some BS it is making up. I will address the ebpf one this week.

cheers,
jamal

Quoted 25 lines
Fixes 3f14b377d01d ("net/sched: act_ct: fix skb leak and crash on ooo frags")
---
 net/sched/cls_api.c | 3 +++
 1 file changed, 3 insertions(+)
net/sched/cls_api.c +3 -1
index 20f7f9ee0b353..3e67600a4a1a1 100644
@@ -4049,6 +4049,9 @@ struct sk_buff *tcf_qevent_handle(struct tcf_qevent *qe, struct Qdisc *sch, stru
                skb_do_redirect(skb);
                *ret = __NET_XMIT_STOLEN;
                return NULL;
+       case TC_ACT_CONSUMED:
+               *ret = __NET_XMIT_STOLEN;
+               return NULL;
        }
 
        return skb;
--

2.34.1

#2 lore raw
In reply to Jamal Hadi Salim
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 5 lines · On Sat, 20 Jun 2026 09:07:49 -0400 you wrote:

tcf_classify() can return TC_ACT_CONSUMED while the skb is held by the defragmentation engine (e.g. act_ct on out-of-order fragments). When that happens the skb is no longer owned by the caller and must not be touched again.

Quoted 8 lines

tcf_qevent_handle() did not handle TC_ACT_CONSUMED: it fell through the switch and returned the skb to the caller as if classification had passed. The only qdisc that wires up qevents today is RED, via three call sites (qe_mark on RED_PROB_MARK/HARD_MARK, qe_early_drop on congestion_drop) red_enqueue() was continuing to operate on an skb it no longer owns in this case -- enqueueing it, dropping it, or updating statistics. Resulting in a UAF.

[...]

Here is the summary with links:
- [net,1/1] net/sched: cls_api: Handle TC_ACT_CONSUMED in tcf_qevent_handle

    https://git.kernel.org/netdev/net/c/a8a02897f2b4

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html