FAILED: patch "[PATCH] net/sched: act_ct: remove 'add_helper' dead code" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 00df72e39f306e2f7adb68528a5c92109da6a0a9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026092940-dropout-pebbly-3736@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 00df72e39f306e2f7adb68528a5c92109da6a0a9 Mon Sep 17 00:00:00 2001
From: Ilya Maximets <[email protected]>
Date: Mon, 21 Sep 2026 16:55:47 +0200
Subject: [PATCH] net/sched: act_ct: remove 'add_helper' dead code
This variable can only become 'true' when the connection is not confirmed, but it is only checked when it is confirmed. So, it can be treated as being always false and just removed.
net/sched/act_ct.c +2 -3
@@ -986,7 +986,6 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,struct nf_hook_state state;int nh_ofs, err, retval;struct tcf_ct_params *p; -bool add_helper = false;bool skb_is_ours = false;bool skip_add = false;bool defrag = false;
@@ -1096,14 +1095,14 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, err =__nf_ct_try_assign_helper (ct, p->tmpl,GFP_ATOMIC );if (err) goto drop; - add_helper = true; +if (nat && !nfct_seqadj (ct)) {if (!nfct_seqadj_ext_add (ct)) goto drop; } } -if (nf_ct_is_confirmed (ct) ? ((!cached && !skip_add) || add_helper) : commit) { +if (nf_ct_is_confirmed (ct) ? (!cached && !skip_add) : commit) { err =nf_ct_helper (skb, ct, ctinfo, family);if (err !=NF_ACCEPT ) goto nf_error;
Sasha Levin
maintainerPATCH 1/2 net: openvswitch: conntrack: avoid modifying shared unconfirmed ct entry
From: Ilya Maximets <[email protected]>
[ Upstream commit 26b2bd70d22457556e2fa01cbf1192cb1a94d619 ]
In a case where skb with an unconfirmed ct entry gets cloned, we may end up committing both but with different sets of extensions.
The series of events:
1. The first clone wants to commit and runs the helpers wiring up the extension pointer into the expectation list.
2. Then it looses the confirmation keeping the entry unconfirmed.
3. Second clone now wants to commit labels and adds the new extension for that breaking the pointer in the expectation list causing UAF on the destruction path later.
While this is possible to trigger, there should be no practical network pipeline where committing both clones without modifications into the same zone is needed. So, let's just reset the entry in case for some reason we got an skb with a shared one during commit. This doesn't affect any known use cases, but avoids any potential problems with sharing and modification of the unconfirmed ct entry.
The fixes tag points to the introduction of helpers, since that's the main UAF trigger for the sharing.
Stable-dep-of: 00df72e39f30 ("net/sched: act_ct: remove 'add_helper' dead code")
--- include/net/netfilter/nf_conntrack.h | 5 +++++ net/openvswitch/conntrack.c | 12 ++++++++++++ 2 files changed, 17 insertions(+)
include/net/netfilter/nf_conntrack.h +5 -0
@@ -190,6 +190,11 @@ static inline void nf_ct_put(struct nf_conn *ct)nf_ct_destroy (&ct->ct_general); } +static inline bool nf_ct_shared (const struct nf_conn *ct) +{ +return refcount_read (&ct->ct_general.use) >1 ; +} +/* load module; enable/disable conntrack in this namespace */ int nf_ct_netns_get (struct net *net,u8 nfproto);void nf_ct_netns_put (struct net *net,u8 nfproto);
net/openvswitch/conntrack.c +12 -0
@@ -716,6 +716,18 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,enum ip_conntrack_info ctinfo;struct nf_conn *ct; +/* If the ct entry is not confirmed and shared with some other skb, +* e.g., a cloned one, we can't just modify it with the commit as we +* must not modify the extension set. Reset. +*/ +if (cached && info->commit) { + ct =nf_ct_get (skb, &ctinfo); +if (ct && !nf_ct_is_confirmed (ct) &&nf_ct_shared (ct)) { +nf_reset_ct (skb); + cached = false; + } + } +if (!cached) {struct nf_hook_state state = { .hook =NF_INET_PRE_ROUTING ,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 net/sched: act_ct: remove 'add_helper' dead code
From: Ilya Maximets <[email protected]>
[ Upstream commit 00df72e39f306e2f7adb68528a5c92109da6a0a9 ]
This variable can only become 'true' when the connection is not confirmed, but it is only checked when it is confirmed. So, it can be treated as being always false and just removed.
--- net/sched/act_ct.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/sched/act_ct.c +2 -3
@@ -981,7 +981,6 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,bool cached, commit, clear;int nh_ofs, err, retval;struct tcf_ct_params *p; -bool add_helper = false;bool skb_is_ours = false;bool skip_add = false;bool defrag = false;
@@ -1077,14 +1076,14 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, err =__nf_ct_try_assign_helper (ct, p->tmpl,GFP_ATOMIC );if (err) goto drop; - add_helper = true; +if (p->ct_action &TCA_CT_ACT_NAT && !nfct_seqadj (ct)) {if (!nfct_seqadj_ext_add (ct)) goto drop; } } -if (nf_ct_is_confirmed (ct) ? ((!cached && !skip_add) || add_helper) : commit) { +if (nf_ct_is_confirmed (ct) ? (!cached && !skip_add) : commit) {if (nf_ct_helper (skb, ct, ctinfo, family) !=NF_ACCEPT ) goto drop; }
Signature · 1 line
2.53.0