netfilter: conntrack: restore IPS_CONFIRMED out of nf_conntrack_hash_check_insert()
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: conntrack: restore IPS_CONFIRMED out of nf_conntrack_hash_check_insert()
e6d57e9ff0ae ("netfilter: conntrack: fix rmmod double-free race") consolidates IPS_CONFIRMED bit set in nf_conntrack_hash_check_insert(). However, this breaks ctnetlink:
# conntrack -I -p tcp --timeout 123 --src 1.2.3.4 --dst 5.6.7.8 --state ESTABLISHED --sport 1 --dport 4 -u SEEN_REPLY conntrack v1.4.6 (conntrack-tools): Operation failed: Device or resource busy
This is a partial revert of the aforementioned commit.
--- net/netfilter/nf_conntrack_bpf.c | 1 + net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/nf_conntrack_netlink.c | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-)
net/netfilter/nf_conntrack_bpf.c +1 -0
@@ -381,6 +381,7 @@ __bpf_kfunc struct nf_conn *bpf_ct_insert_entry(struct nf_conn___init *nfct_i)struct nf_conn *nfct = (struct nf_conn *)nfct_i;int err; + nfct->status |=IPS_CONFIRMED ; err =nf_conntrack_hash_check_insert (nfct);if (err <0 ) {nf_conntrack_free (nfct);
net/netfilter/nf_conntrack_core.c +0 -1
@@ -932,7 +932,6 @@ nf_conntrack_hash_check_insert(struct nf_conn *ct) goto out; } - ct->status |=IPS_CONFIRMED ;smp_wmb ();/* The caller holds a reference to this object */ refcount_set (&ct->ct_general.use,2 );
net/netfilter/nf_conntrack_netlink.c +3 -0
@@ -2316,6 +2316,9 @@ ctnetlink_create_conntrack(struct net *net,nfct_seqadj_ext_add (ct);nfct_synproxy_ext_add (ct); +/* we must add conntrack extensions before confirmation. */ + ct->status |=IPS_CONFIRMED ; +if (cda[CTA_STATUS ]) { err =ctnetlink_change_status (ct, cda);if (err <0 )
Signature · 1 line
2.30.2
Florian Westphal
maintainerQuoted 24 lines · Pablo Neira Ayuso
e6d57e9ff0ae("netfilter: conntrack: fix rmmod double-free race") consolidatesIPS_CONFIRMEDbit set innf_conntrack_hash_check_insert(). However, this breaks ctnetlink:# conntrack -I -p tcp --timeout 123 --src 1.2.3.4 --dst 5.6.7.8 --state ESTABLISHED --sport 1 --dport 4 -u SEEN_REPLY conntrack v1.4.6 (conntrack-tools): Operation failed: Device or resource busyThis is a partial revert of the aforementioned commit.
Fixes e6d57e9ff0ae ("netfilter: conntrack: fix rmmod double-free race")Reported-by Stéphane Graber <[email protected]>Tested-by Stéphane Graber <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/netfilter/nf_conntrack_bpf.c | 1 + net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/nf_conntrack_netlink.c | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-)net/netfilter/nf_conntrack_netlink.c +0
-0
net/netfilter/nf_conntrack_netlink.c ctnetlink_create_conntrack(struct net *net, · line 2321
Quoted 6 lines
net/netfilter/nf_conntrack_netlink.c +3
-0@@ -2316,6 +2316,9 @@ ctnetlink_create_conntrack(struct net *net,nfct_seqadj_ext_add (ct);nfct_synproxy_ext_add (ct); +/* we must add conntrack extensions before confirmation. */ + ct->status |=IPS_CONFIRMED ; +
I'd guess that these 2 lines are the only part that is needed, but up to you.
Pablo Neira Ayuso
maintainerQuoted 28 lines · Florian Westphal
Quoted 27 lines · Pablo Neira Ayuso
e6d57e9ff0ae("netfilter: conntrack: fix rmmod double-free race") consolidatesIPS_CONFIRMEDbit set innf_conntrack_hash_check_insert(). However, this breaks ctnetlink:# conntrack -I -p tcp --timeout 123 --src 1.2.3.4 --dst 5.6.7.8 --state ESTABLISHED --sport 1 --dport 4 -u SEEN_REPLY conntrack v1.4.6 (conntrack-tools): Operation failed: Device or resource busyThis is a partial revert of the aforementioned commit.
Fixes e6d57e9ff0ae ("netfilter: conntrack: fix rmmod double-free race")Reported-by Stéphane Graber <[email protected]>Tested-by Stéphane Graber <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/netfilter/nf_conntrack_bpf.c | 1 + net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/nf_conntrack_netlink.c | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-)net/netfilter/nf_conntrack_netlink.c +0
-0@@ -2316,6 +2316,9 @@ ctnetlink_create_conntrack(struct net *net,nfct_seqadj_ext_add (ct);nfct_synproxy_ext_add (ct);
Quoted 6 lines
net/netfilter/nf_conntrack_netlink.c ctnetlink_create_conntrack(struct net *net, · line 2321
Quoted 3 lines
net/netfilter/nf_conntrack_netlink.c +3
-0+/* we must add conntrack extensions before confirmation. */ + ct->status |=IPS_CONFIRMED ; +I'd guess that these 2 lines are the only part that is needed, but up to you.
OK, I have drropped the bfp chunk.