netfilter: nf_flow_table: fix teardown flow timeout
Subsystems (3)
PATCH v2 1/1 netfilter: nf_flow_table: fix teardown flow timeout
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set. Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that flow_offload_teardown is called by a TCP FIN packet we also need to make sure that flow_offload_fixup_ct is also called in flow_offload_del and only fixes up established TCP connections.
------------
v1 -> v2 changes
- Add flow_teardown flag
- Add nftables handling
- Fixup timeout according to the current ct state
--- include/uapi/linux/netfilter/nf_conntrack_common.h | 6 +++- net/netfilter/nf_conntrack_core.c | 3 +- net/netfilter/nf_flow_table_core.c | 42 +++++++++------------- net/netfilter/nft_flow_offload.c | 2 ++ 4 files changed, 25 insertions(+), 28 deletions(-)
include/uapi/linux/netfilter/nf_conntrack_common.h +5 -1
@@ -118,6 +118,10 @@ enum ip_conntrack_status {IPS_HW_OFFLOAD_BIT =15 ,IPS_HW_OFFLOAD = (1 <<IPS_HW_OFFLOAD_BIT ), +/* offloaded conntrack entry is marked for deletion. */ +IPS_OFFLOAD_TEARDOWN_BIT =16 , +IPS_OFFLOAD_TEARDOWN = (1 <<IPS_OFFLOAD_TEARDOWN_BIT ), +/* Be careful here, modifying these bits can make things messy, * so don't let users modify them directly. */
@@ -126,7 +130,7 @@ enum ip_conntrack_status {IPS_SEQ_ADJUST |IPS_TEMPLATE |IPS_UNTRACKED | IPS_OFFLOAD | IPS_HW_OFFLOAD), - __IPS_MAX_BIT = 16, + __IPS_MAX_BIT = 17, };/* Connection tracking event types */
net/netfilter/nf_conntrack_core.c +2 -1
@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp); +if (!test_bit (IPS_OFFLOAD_TEARDOWN_BIT , &tmp->status)) +nf_ct_offload_timeout (tmp);continue ; }
net/netfilter/nf_flow_table_core.c +16 -26
82 lines not on this page · raw message
net/netfilter/nft_flow_offload.c +2 -0
@@ -295,6 +295,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, sizeof(_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out; +if (unlikely (!nf_conntrack_tcp_established (ct))) + goto out;break ;case IPPROTO_UDP :break ;
Signature · 1 line
1.8.3.1
Pablo Neira Ayuso
maintainerQuoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.
[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);
Hm, it is the trick to avoid checking for IPS_OFFLOAD from the packet path that triggers the race, ie. nf_ct_is_expired()
The flowtable ct fixup races with conntrack gc collector.
Clearing IPS_OFFLOAD might result in offloading the entry again for the closing packets.
Probably clear IPS_OFFLOAD from teardown, and skip offload if flow is in a TCP state that represent closure?
if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;
this is already the intention in the existing code.
If this does work, could you keep IPS_OFFLOAD_TEARDOWN_BIT internal, ie. no in uapi? Define it at include/net/netfilter/nf_conntrack.h and add a comment regarding this to avoid an overlap in the future.
Quoted 70 lines
net/netfilter/nf_conntrack_core.c +2
-0+if (!test_bit (IPS_OFFLOAD_TEARDOWN_BIT , &tmp->status)) +nf_ct_offload_timeout (tmp);continue ; }net/netfilter/nf_flow_table_core.c +10
-20@@ -177,14 +177,8 @@ int flow_offload_route_init(struct flow_offload *flow, }EXPORT_SYMBOL_GPL (flow_offload_route_init); -static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) -{ - tcp->state =TCP_CONNTRACK_ESTABLISHED ; - tcp->seen[0 ].td_maxwin =0 ; - tcp->seen[1 ].td_maxwin =0 ; -} -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);@@ -192,8 +186,12 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); +struct ip_ct_tcp *tcp = &ct->proto.tcp; + + tcp->seen[0 ].td_maxwin =0 ; + tcp->seen[1 ].td_maxwin =0 ; - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);@@ -211,18 +209,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );@@ -353,6 +339,10 @@ static inline bool nf_flow_has_expired(const struct flow_offload *flow)static void flow_offload_del (struct nf_flowtable *flow_table,struct flow_offload *flow) { +struct nf_conn *ct = flow->ct; + +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); +rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].node, nf_flow_offload_rhash_params);
net/netfilter/nf_flow_table_core.c static void flow_offload_del(struct nf_flowtable *flow_table, · line 354
Quoted 10 lines
net/netfilter/nf_flow_table_core.c +1
-5@@ -360,12 +350,11 @@ static void flow_offload_del(struct nf_flowtable *flow_table, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); +flow_offload_fixup_ct (ct);
Very unlikely, but race might still happen between fixup and clear IPS_OFFLOAD_BIT with gc below?
Without checking from the packet path, the conntrack gc might race to refresh the timeout, I don't see a 100% race free solution.
Probably update the nf_ct_offload_timeout to a shorter value than a day would mitigate this issue too.
Quoted 21 lines
net/netfilter/nf_flow_table_core.c +4
-1+clear_bit (IPS_OFFLOAD_BIT , &ct->status); +clear_bit (IPS_OFFLOAD_TEARDOWN_BIT , &ct->status);flow_offload_free (flow); }@@ -373,8 +362,9 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);net/netfilter/nft_flow_offload.c +0
-0
net/netfilter/nft_flow_offload.c static void nft_flow_offload_eval(const struct nft_expr *expr, · line 299
Quoted 5 lines
net/netfilter/nft_flow_offload.c +2
-0@@ -295,6 +295,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, sizeof(_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out; +if (unlikely (!nf_conntrack_tcp_established (ct))) + goto out;
This chunk is not required, from ruleset users can do
... ct status assured ...
instead.
Quoted 6 lines
net/netfilter/nft_flow_offload.c +0
-0break ;case IPPROTO_UDP :break ;Signature · 1 line
1.8.3.1
Quoted 132 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
If this does work, could you keep
IPS_OFFLOAD_TEARDOWN_BITinternal, ie. no in uapi? Define it atinclude/net/netfilter/nf_conntrack.hand add a comment regarding this to avoid an overlap in the future.Quoted 70 lines
net/netfilter/nf_conntrack_core.c +2
-0+if (!test_bit (IPS_OFFLOAD_TEARDOWN_BIT , &tmp->status)) +nf_ct_offload_timeout (tmp);continue ; }net/netfilter/nf_flow_table_core.c +10
-20@@ -177,14 +177,8 @@ int flow_offload_route_init(struct flow_offload *flow, }EXPORT_SYMBOL_GPL (flow_offload_route_init); -static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) -{ - tcp->state =TCP_CONNTRACK_ESTABLISHED ; - tcp->seen[0 ].td_maxwin =0 ; - tcp->seen[1 ].td_maxwin =0 ; -} -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);@@ -192,8 +186,12 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); +struct ip_ct_tcp *tcp = &ct->proto.tcp; + + tcp->seen[0 ].td_maxwin =0 ; + tcp->seen[1 ].td_maxwin =0 ; - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);@@ -211,18 +209,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );@@ -353,6 +339,10 @@ static inline bool nf_flow_has_expired(const struct flow_offload *flow)static void flow_offload_del (struct nf_flowtable *flow_table,struct flow_offload *flow) { +struct nf_conn *ct = flow->ct; + +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); +rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].node, nf_flow_offload_rhash_params);net/netfilter/nf_flow_table_core.c static void flow_offload_del(struct nf_flowtable *flow_table, · line 354
Quoted 10 lines
net/netfilter/nf_flow_table_core.c +1
-5@@ -360,12 +350,11 @@ static void flow_offload_del(struct nf_flowtable *flow_table, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); +flow_offload_fixup_ct (ct);Very unlikely, but race might still happen between fixup and clear
IPS_OFFLOAD_BITwith gc below?
Quoted 5 lines
Without checking from the packet path, the conntrack gc might race to refresh the timeout, I don't see a 100% race free solution.
Probably update the
nf_ct_offload_timeoutto a shorter value than a day would mitigate this issue too.
This section of the code is now protected by IPS_OFFLOAD_TEARDOWN_BIT which will prevent the update via nf_ct_offload_timeout.
We set it at the beginning of flow_offload_del and flow_offload_teardown.
Since flow_offload_teardown is only called on TCP packets we also need to set it at flow_offload_del to prevent the race.
This should prevent the race at this point.
Quoted 30 lines
Quoted 22 lines
net/netfilter/nf_flow_table_core.c +4
-1+clear_bit (IPS_OFFLOAD_BIT , &ct->status); +clear_bit (IPS_OFFLOAD_TEARDOWN_BIT , &ct->status);flow_offload_free (flow); }@@ -373,8 +362,9 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);net/netfilter/nft_flow_offload.c +0
-0net/netfilter/nft_flow_offload.c static void nft_flow_offload_eval(const struct nft_expr *expr, · line 299
Quoted 5 lines
net/netfilter/nft_flow_offload.c +2
-0@@ -295,6 +295,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, sizeof(_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out; +if (unlikely (!nf_conntrack_tcp_established (ct))) + goto out;This chunk is not required, from ruleset users can do
Quoted 3 lines
... ct status assured ...
instead.
Maybe this should be mentioned in the manual or wiki if it is not necessary in the flow offload code.
Quoted 7 lines
Quoted 7 lines
net/netfilter/nft_flow_offload.c +0
-0break ;case IPPROTO_UDP :break ;Signature · 1 line
1.8.3.1
Pablo Neira Ayuso
maintainerQuoted 139 lines · Sven Auhagen
Quoted 132 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
If this does work, could you keep
IPS_OFFLOAD_TEARDOWN_BITinternal, ie. no in uapi? Define it atinclude/net/netfilter/nf_conntrack.hand add a comment regarding this to avoid an overlap in the future.Quoted 70 lines
net/netfilter/nf_conntrack_core.c +2
-0+if (!test_bit (IPS_OFFLOAD_TEARDOWN_BIT , &tmp->status)) +nf_ct_offload_timeout (tmp);continue ; }net/netfilter/nf_flow_table_core.c +10
-20@@ -177,14 +177,8 @@ int flow_offload_route_init(struct flow_offload *flow, }EXPORT_SYMBOL_GPL (flow_offload_route_init); -static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) -{ - tcp->state =TCP_CONNTRACK_ESTABLISHED ; - tcp->seen[0 ].td_maxwin =0 ; - tcp->seen[1 ].td_maxwin =0 ; -} -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);@@ -192,8 +186,12 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); +struct ip_ct_tcp *tcp = &ct->proto.tcp; + + tcp->seen[0 ].td_maxwin =0 ; + tcp->seen[1 ].td_maxwin =0 ; - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);@@ -211,18 +209,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );@@ -353,6 +339,10 @@ static inline bool nf_flow_has_expired(const struct flow_offload *flow)static void flow_offload_del (struct nf_flowtable *flow_table,struct flow_offload *flow) { +struct nf_conn *ct = flow->ct; + +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); +rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].node, nf_flow_offload_rhash_params);net/netfilter/nf_flow_table_core.c static void flow_offload_del(struct nf_flowtable *flow_table, · line 354
Quoted 10 lines
net/netfilter/nf_flow_table_core.c +1
-5@@ -360,12 +350,11 @@ static void flow_offload_del(struct nf_flowtable *flow_table, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); +flow_offload_fixup_ct (ct);Very unlikely, but race might still happen between fixup and clear
IPS_OFFLOAD_BITwith gc below?Quoted 5 lines
Without checking from the packet path, the conntrack gc might race to refresh the timeout, I don't see a 100% race free solution.
Probably update the
nf_ct_offload_timeoutto a shorter value than a day would mitigate this issue too.
Quoted 8 lines
This section of the code is now protected by
IPS_OFFLOAD_TEARDOWN_BITwhich will prevent the update vianf_ct_offload_timeout.
We set it at the beginning offlow_offload_delandflow_offload_teardown.Since
flow_offload_teardownis only called on TCP packets we also need to set it atflow_offload_delto prevent the race.This should prevent the race at this point.
OK.
Quoted 29 lines
Quoted 29 lines
Quoted 21 lines
net/netfilter/nf_flow_table_core.c +4
-1+clear_bit (IPS_OFFLOAD_BIT , &ct->status); +clear_bit (IPS_OFFLOAD_TEARDOWN_BIT , &ct->status);flow_offload_free (flow); }@@ -373,8 +362,9 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);net/netfilter/nft_flow_offload.c +0
-0net/netfilter/nft_flow_offload.c static void nft_flow_offload_eval(const struct nft_expr *expr, · line 299
Quoted 5 lines
net/netfilter/nft_flow_offload.c +2
-0@@ -295,6 +295,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, sizeof(_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out; +if (unlikely (!nf_conntrack_tcp_established (ct))) + goto out;This chunk is not required, from ruleset users can do
Quoted 6 lines
Quoted 3 lines
... ct status assured ...
instead.
Maybe this should be mentioned in the manual or wiki if it is not necessary in the flow offload code.
Yes, documentation and wiki can be updated.
Users might want to offload the flow at a later stage in the TCP connection.
Pablo Neira Ayuso
maintainerQuoted 184 lines · Pablo Neira Ayuso
Quoted 139 lines · Sven Auhagen
Quoted 132 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
If this does work, could you keep
IPS_OFFLOAD_TEARDOWN_BITinternal, ie. no in uapi? Define it atinclude/net/netfilter/nf_conntrack.hand add a comment regarding this to avoid an overlap in the future.Quoted 70 lines
net/netfilter/nf_conntrack_core.c +2
-0+if (!test_bit (IPS_OFFLOAD_TEARDOWN_BIT , &tmp->status)) +nf_ct_offload_timeout (tmp);continue ; }net/netfilter/nf_flow_table_core.c +10
-20@@ -177,14 +177,8 @@ int flow_offload_route_init(struct flow_offload *flow, }EXPORT_SYMBOL_GPL (flow_offload_route_init); -static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) -{ - tcp->state =TCP_CONNTRACK_ESTABLISHED ; - tcp->seen[0 ].td_maxwin =0 ; - tcp->seen[1 ].td_maxwin =0 ; -} -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);@@ -192,8 +186,12 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); +struct ip_ct_tcp *tcp = &ct->proto.tcp; + + tcp->seen[0 ].td_maxwin =0 ; + tcp->seen[1 ].td_maxwin =0 ; - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);@@ -211,18 +209,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );@@ -353,6 +339,10 @@ static inline bool nf_flow_has_expired(const struct flow_offload *flow)static void flow_offload_del (struct nf_flowtable *flow_table,struct flow_offload *flow) { +struct nf_conn *ct = flow->ct; + +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); +rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].node, nf_flow_offload_rhash_params);net/netfilter/nf_flow_table_core.c static void flow_offload_del(struct nf_flowtable *flow_table, · line 354
Quoted 10 lines
net/netfilter/nf_flow_table_core.c +1
-5@@ -360,12 +350,11 @@ static void flow_offload_del(struct nf_flowtable *flow_table, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); +flow_offload_fixup_ct (ct);Very unlikely, but race might still happen between fixup and clear
IPS_OFFLOAD_BITwith gc below?Quoted 5 lines
Without checking from the packet path, the conntrack gc might race to refresh the timeout, I don't see a 100% race free solution.
Probably update the
nf_ct_offload_timeoutto a shorter value than a day would mitigate this issue too.Quoted 8 lines
This section of the code is now protected by
IPS_OFFLOAD_TEARDOWN_BITwhich will prevent the update vianf_ct_offload_timeout.
We set it at the beginning offlow_offload_delandflow_offload_teardown.Since
flow_offload_teardownis only called on TCP packets we also need to set it atflow_offload_delto prevent the race.This should prevent the race at this point.
OK.
Quoted 33 lines
Quoted 32 lines
Quoted 21 lines
net/netfilter/nf_flow_table_core.c +4
-1+clear_bit (IPS_OFFLOAD_BIT , &ct->status); +clear_bit (IPS_OFFLOAD_TEARDOWN_BIT , &ct->status);flow_offload_free (flow); }@@ -373,8 +362,9 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);net/netfilter/nft_flow_offload.c +0
-0net/netfilter/nft_flow_offload.c static void nft_flow_offload_eval(const struct nft_expr *expr, · line 299
Quoted 5 lines
net/netfilter/nft_flow_offload.c +2
-0@@ -295,6 +295,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, sizeof(_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out; +if (unlikely (!nf_conntrack_tcp_established (ct))) + goto out;This chunk is not required, from ruleset users can do
... ct status assured ...
instead.
Quoted 7 lines
Quoted 2 lines
Maybe this should be mentioned in the manual or wiki if it is not necessary in the flow offload code.
Yes, documentation and wiki can be updated.
Users might want to offload the flow at a later stage in the TCP connection.
Well, actually there is not later stage than established, anything after established are TCP teardown states.
What's the issue with allowing to offload from SYN_RECV state?
Pablo Neira Ayuso
maintainerQuoted 36 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.
Quoted 7 lines
Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra IPS_ bit.
net/netfilter/nf_flow_table_core.c +1 -2
@@ -362,8 +362,6 @@ static void flow_offload_del(struct nf_flowtable *flow_table, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); -if (nf_flow_has_expired (flow))flow_offload_fixup_ct (flow->ct);else
@@ -375,6 +373,7 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); +clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status);flow_offload_fixup_ct_state (flow->ct); }
net/netfilter/nft_flow_offload.c +8 -1
@@ -273,6 +273,12 @@ static bool nft_flow_offload_skip(struct sk_buff *skb, int family)return false; } +static bool flow_offload_teardown_state (const struct ip_ct_tcp *state) +{ +return state->state >TCP_CONNTRACK_ESTABLISHED && + state->state <=TCP_CONNTRACK_CLOSE ; +} +static void nft_flow_offload_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -298,7 +304,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,case IPPROTO_TCP : tcph =skb_header_pointer (pkt->skb,nft_thoff (pkt),sizeof (_tcph), &_tcph); -if (unlikely (!tcph || tcph->fin || tcph->rst)) +if (unlikely (!tcph || tcph->fin || tcph->rst || +flow_offload_teardown_state (ct->proto.tcp))) goto out;break ;case IPPROTO_UDP :
Quoted 190 lines · Pablo Neira Ayuso
Quoted 189 lines · Pablo Neira Ayuso
Quoted 139 lines · Sven Auhagen
Quoted 132 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
If this does work, could you keep
IPS_OFFLOAD_TEARDOWN_BITinternal, ie. no in uapi? Define it atinclude/net/netfilter/nf_conntrack.hand add a comment regarding this to avoid an overlap in the future.Quoted 70 lines
net/netfilter/nf_conntrack_core.c +2
-0+if (!test_bit (IPS_OFFLOAD_TEARDOWN_BIT , &tmp->status)) +nf_ct_offload_timeout (tmp);continue ; }net/netfilter/nf_flow_table_core.c +10
-20@@ -177,14 +177,8 @@ int flow_offload_route_init(struct flow_offload *flow, }EXPORT_SYMBOL_GPL (flow_offload_route_init); -static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) -{ - tcp->state =TCP_CONNTRACK_ESTABLISHED ; - tcp->seen[0 ].td_maxwin =0 ; - tcp->seen[1 ].td_maxwin =0 ; -} -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);@@ -192,8 +186,12 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); +struct ip_ct_tcp *tcp = &ct->proto.tcp; + + tcp->seen[0 ].td_maxwin =0 ; + tcp->seen[1 ].td_maxwin =0 ; - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);@@ -211,18 +209,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );@@ -353,6 +339,10 @@ static inline bool nf_flow_has_expired(const struct flow_offload *flow)static void flow_offload_del (struct nf_flowtable *flow_table,struct flow_offload *flow) { +struct nf_conn *ct = flow->ct; + +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); +rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].node, nf_flow_offload_rhash_params);net/netfilter/nf_flow_table_core.c static void flow_offload_del(struct nf_flowtable *flow_table, · line 354
Quoted 10 lines
net/netfilter/nf_flow_table_core.c +1
-5@@ -360,12 +350,11 @@ static void flow_offload_del(struct nf_flowtable *flow_table, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); +flow_offload_fixup_ct (ct);Very unlikely, but race might still happen between fixup and clear
IPS_OFFLOAD_BITwith gc below?Quoted 5 lines
Without checking from the packet path, the conntrack gc might race to refresh the timeout, I don't see a 100% race free solution.
Probably update the
nf_ct_offload_timeoutto a shorter value than a day would mitigate this issue too.Quoted 8 lines
This section of the code is now protected by
IPS_OFFLOAD_TEARDOWN_BITwhich will prevent the update vianf_ct_offload_timeout.
We set it at the beginning offlow_offload_delandflow_offload_teardown.Since
flow_offload_teardownis only called on TCP packets we also need to set it atflow_offload_delto prevent the race.This should prevent the race at this point.
OK.
Quoted 29 lines
Quoted 29 lines
Quoted 21 lines
net/netfilter/nf_flow_table_core.c +4
-1+clear_bit (IPS_OFFLOAD_BIT , &ct->status); +clear_bit (IPS_OFFLOAD_TEARDOWN_BIT , &ct->status);flow_offload_free (flow); }@@ -373,8 +362,9 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);net/netfilter/nft_flow_offload.c +0
-0net/netfilter/nft_flow_offload.c static void nft_flow_offload_eval(const struct nft_expr *expr, · line 299
Quoted 5 lines
net/netfilter/nft_flow_offload.c +2
-0@@ -295,6 +295,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, sizeof(_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out; +if (unlikely (!nf_conntrack_tcp_established (ct))) + goto out;This chunk is not required, from ruleset users can do
Quoted 6 lines
Quoted 3 lines
... ct status assured ...
instead.
Maybe this should be mentioned in the manual or wiki if it is not necessary in the flow offload code.
Yes, documentation and wiki can be updated.
Quoted 7 lines
Quoted 2 lines
Users might want to offload the flow at a later stage in the TCP connection.
Well, actually there is not later stage than established, anything after established are TCP teardown states.
What's the issue with allowing to offload from
SYN_RECVstate?
There were multiple problem in general with the code. flow_offload_fixup_tcp always moves a TCP connection to established even if it is in FIN or CLOSE.
The flowoffload_del function was always setting the TCP timeout to ESTABLISHED timeout even when the state was in CLOSE and therefore creating a very long lasting dead state.
Since we might miss or bump packets to slow path, we do not know what will happen there when we are still in SYN_RECV.
We will have a better knowledge of the TCP state when we are in established first and we know that we are either still in it or we have moved past it to a closing state.
Quoted 40 lines · Pablo Neira Ayuso
Quoted 39 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?
Quoted 7 lines
Quoted 4 lines
if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra
IPS_bit.
You might create a race with ct gc that will remove the ct
if it is in close or end of close and before flow offload teardown is running so flow offload teardown might access memory that was freed.
It is not a very likely scenario but never the less it might happen now since the IPS_OFFLOAD_BIT is not set and the state might just time out.
If someone sets a very small TCP CLOSE timeout it gets more likely.
So Oz and myself were debatting about three possible cases/problems:
1. ct gc sets timeout even though the state is in CLOSE/FIN because the IPS_OFFLOAD is still set but the flow is in teardown
2. ct gc removes the ct because the IPS_OFFLOAD is not set and the CLOSE timeout is reached before the flow offload del
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state is already CLOSED.
Also as a remark we can not assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
Best
Sven
Pablo Neira Ayuso
maintainerQuoted 44 lines · Sven Auhagen
Quoted 43 lines · Pablo Neira Ayuso
Quoted 42 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra
IPS_bit.You might create a race with ct gc that will remove the ct
if it is in close or end of close and before flow offload teardown is running so flow offload teardown might access memory that was freed.
flow object holds a reference to the ct object until it is released, no use-after-free can happen.
Quoted 11 lines
It is not a very likely scenario but never the less it might happen now since the
IPS_OFFLOAD_BITis not set and the state might just time out.If someone sets a very small TCP CLOSE timeout it gets more likely.
So Oz and myself were debatting about three possible cases/problems:
1. ct gc sets timeout even though the state is in CLOSE/FIN because the
IPS_OFFLOADis still set but the flow is in teardown
2. ct gc removes the ct because theIPS_OFFLOADis not set and the CLOSE timeout is reached before the flow offload del
OK.
Quoted 7 lines
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state is already CLOSED.
Also as a remark we can not assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
I assume this remark is related to 3.?
if IPS_OFFLOAD is unset, then conntrack would update the state according to this FIN or RST.
Thanks for the summary.
Quoted 50 lines · Pablo Neira Ayuso
Quoted 49 lines · Sven Auhagen
Quoted 47 lines · Pablo Neira Ayuso
Quoted 36 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Quoted 7 lines
Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra
IPS_bit.
Quoted 7 lines
Quoted 3 lines
You might create a race with ct gc that will remove the ct
if it is in close or end of close and before flow offload teardown is running so flow offload teardown might access memory that was freed.flow object holds a reference to the ct object until it is released, no use-after-free can happen.
Also if nf_ct_delete is called before flowtable delete? Can you let me know why?
Quoted 18 lines
Quoted 11 lines
It is not a very likely scenario but never the less it might happen now since the
IPS_OFFLOAD_BITis not set and the state might just time out.If someone sets a very small TCP CLOSE timeout it gets more likely.
So Oz and myself were debatting about three possible cases/problems:
1. ct gc sets timeout even though the state is in CLOSE/FIN because the
IPS_OFFLOADis still set but the flow is in teardown
2. ct gc removes the ct because theIPS_OFFLOADis not set and the CLOSE timeout is reached before the flow offload delOK.
Quoted 4 lines
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state is already CLOSED.
Quoted 5 lines
Quoted 3 lines
Also as a remark we can not assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
I assume this remark is related to 3.?
Yes, exactly.
Quoted 4 lines
if
IPS_OFFLOADis unset, then conntrack would update the state according to this FIN or RST.
It will move to a different TCP state anyways only the ct state will be at IPS_OFFLOAD_BIT and prevent it from beeing garbage collected. The timeout will be bumped back up as long as IPS_OFFLOAD_BIT is set even though TCP might already be CLOSED.
Quoted 1 line
Thanks for the summary.
Pablo Neira Ayuso
maintainerQuoted 5 lines · Sven Auhagen
Quoted 4 lines · Pablo Neira Ayuso
Quoted 3 lines · Sven Auhagen
Quoted 2 lines · Pablo Neira Ayuso
Quoted 1 line · Pablo Neira Ayuso
On Thu, May 12, 2022 at 09:28:03PM +0300, Oz Shlomo wrote:
[...]
Quoted 34 lines
Quoted 34 lines
Quoted 33 lines
Quoted 22 lines
Quoted 22 lines
[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?Quoted 7 lines
Quoted 4 lines
if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra
IPS_bit.You might create a race with ct gc that will remove the ct
if it is in close or end of close and before flow offload teardown is running so flow offload teardown might access memory that was freed.
Quoted 6 lines
Quoted 3 lines
flow object holds a reference to the ct object until it is released, no use-after-free can happen.
Also if
nf_ct_deleteis called before flowtable delete? Can you let me know why?
nf_ct_delete() removes the conntrack object from lists and it decrements the reference counter by one.
flow_offload_free() also calls nf_ct_put(). flow_offload_alloc() bumps the reference count on the conntrack object before creating the flow.
Quoted 26 lines
Quoted 18 lines
Quoted 11 lines
It is not a very likely scenario but never the less it might happen now since the
IPS_OFFLOAD_BITis not set and the state might just time out.If someone sets a very small TCP CLOSE timeout it gets more likely.
So Oz and myself were debatting about three possible cases/problems:
1. ct gc sets timeout even though the state is in CLOSE/FIN because the
IPS_OFFLOADis still set but the flow is in teardown
2. ct gc removes the ct because theIPS_OFFLOADis not set and the CLOSE timeout is reached before the flow offload delOK.
Quoted 4 lines
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state is already CLOSED.
Quoted 5 lines
Quoted 3 lines
Also as a remark we can not assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
I assume this remark is related to 3.?
Yes, exactly.
Quoted 7 lines
Quoted 2 lines
if
IPS_OFFLOADis unset, then conntrack would update the state according to this FIN or RST.It will move to a different TCP state anyways only the ct state will be at
IPS_OFFLOAD_BITand prevent it from beeing garbage collected. The timeout will be bumped back up as long asIPS_OFFLOAD_BITis set even though TCP might already be CLOSED.
If teardown fixes the ct state and timeout to established, and IPS_OFFLOAD is unset, then the packet is passed up in a consistent state.
I made a patch, it is based on yours, it's attached:
- If flow timeout expires or rst/fin is seen, ct state and timeout is fixed up (to established state) and IPS_OFFLOAD is unset.
- If rst/fin packet is seen, ct state and timeout is fixed up (to established state) and IPS_OFFLOAD is unset. The packet continues its travel up to the classic path, so conntrack triggers the transition from established to one of the close states.
For the case 1., IPS_OFFLOAD is not set anymore, so conntrack gc cannot race to reset the ct timeout anymore.
For the case 2., if gc conntrack ever removes the ct entry, then the IPS_DYING bit is set, which implicitly triggers the teardown state from the flowtable gc. The flowtable still holds a reference to the ct object, so no UAF can happen.
For the case 3. the conntrack is set to ESTABLISHED with a long timeout, yes. This is to deal with the two possible cases:
a) flowtable timeout expired, so conntrack recovers control on the flow.
b) tcp rst/fin will take back the packet to slow path. The ct has been fixed up to established state so it will trasition to one of the close states.
Am I missing anything?
commit f11b613b1f63a70e4dacae7ff73ce1895c96c6d1
Author: Pablo Neira Ayuso <[email protected]> Date: Mon May 16 18:44:19 2022 +0200
x
net/netfilter/nf_flow_table_core.c +7 -23
@@ -184,7 +184,7 @@ static void flow_offload_fixup_tcp(struct ip_ct_tcp *tcp) tcp->seen[1 ].td_maxwin =0 ; } -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);
@@ -193,6 +193,8 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); +flow_offload_fixup_tcp (&ct->proto.tcp); + timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {
@@ -211,18 +213,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );
@@ -361,14 +351,6 @@ static void flow_offload_del(struct nf_flowtable *flow_table,rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); - -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); - -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); -flow_offload_free (flow); }
@@ -376,7 +358,9 @@ void flow_offload_teardown(struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); + +clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); }EXPORT_SYMBOL_GPL (flow_offload_teardown);
@@ -466,7 +450,7 @@ static void nf_flow_offload_gc_step(struct nf_flowtable *flow_table,if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) ||nf_flow_has_stale_dst (flow)) -set_bit (NF_FLOW_TEARDOWN , &flow->flags); +flow_offload_teardown (flow);if (test_bit (NF_FLOW_TEARDOWN , &flow->flags)) {if (test_bit (NF_FLOW_HW , &flow->flags)) {
net/netfilter/nft_flow_offload.c +8 -1
@@ -273,6 +273,12 @@ static bool nft_flow_offload_skip(struct sk_buff *skb, int family)return false; } +static bool flow_offload_teardown_state (const struct ip_ct_tcp *state) +{ +return state->state >TCP_CONNTRACK_ESTABLISHED && + state->state <=TCP_CONNTRACK_CLOSE ; +} +static void nft_flow_offload_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -298,7 +304,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,case IPPROTO_TCP : tcph =skb_header_pointer (pkt->skb,nft_thoff (pkt),sizeof (_tcph), &_tcph); -if (unlikely (!tcph || tcph->fin || tcph->rst)) +if (unlikely (!tcph || tcph->fin || tcph->rst || +flow_offload_teardown_state (&ct->proto.tcp))) goto out;break ;case IPPROTO_UDP :
Pablo Neira Ayuso
maintainerQuoted 203 lines · Sven Auhagen
Quoted 190 lines · Pablo Neira Ayuso
Quoted 189 lines · Pablo Neira Ayuso
Quoted 139 lines · Sven Auhagen
Quoted 132 lines · Pablo Neira Ayuso
Quoted 16 lines · Oz Shlomo
Connections leaving the established state (due to RST / FIN TCP packets) set the flow table teardown flag. The packet path continues to set lower timeout value as per the new TCP state but the offload flag remains set.
Hence, the conntrack garbage collector may race to undo the timeout adjustment of the packet path, leaving the conntrack entry in place with the internal offload timeout (one day).
Avoid ct gc timeout overwrite by flagging teared down flowtable connections.
On the nftables side we only need to allow established TCP connections to create a flow offload entry. Since we can not guaruantee that
flow_offload_teardownis called by a TCP FIN packet we also need to make sure thatflow_offload_fixup_ctis also called inflow_offload_deland only fixes up established TCP connections.[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;this is already the intention in the existing code.
If this does work, could you keep
IPS_OFFLOAD_TEARDOWN_BITinternal, ie. no in uapi? Define it atinclude/net/netfilter/nf_conntrack.hand add a comment regarding this to avoid an overlap in the future.Quoted 70 lines
net/netfilter/nf_conntrack_core.c +2
-0+if (!test_bit (IPS_OFFLOAD_TEARDOWN_BIT , &tmp->status)) +nf_ct_offload_timeout (tmp);continue ; }net/netfilter/nf_flow_table_core.c +10
-20@@ -177,14 +177,8 @@ int flow_offload_route_init(struct flow_offload *flow, }EXPORT_SYMBOL_GPL (flow_offload_route_init); -static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) -{ - tcp->state =TCP_CONNTRACK_ESTABLISHED ; - tcp->seen[0 ].td_maxwin =0 ; - tcp->seen[1 ].td_maxwin =0 ; -} -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);@@ -192,8 +186,12 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); +struct ip_ct_tcp *tcp = &ct->proto.tcp; + + tcp->seen[0 ].td_maxwin =0 ; + tcp->seen[1 ].td_maxwin =0 ; - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);@@ -211,18 +209,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );@@ -353,6 +339,10 @@ static inline bool nf_flow_has_expired(const struct flow_offload *flow)static void flow_offload_del (struct nf_flowtable *flow_table,struct flow_offload *flow) { +struct nf_conn *ct = flow->ct; + +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); +rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].node, nf_flow_offload_rhash_params);net/netfilter/nf_flow_table_core.c static void flow_offload_del(struct nf_flowtable *flow_table, · line 354
Quoted 10 lines
net/netfilter/nf_flow_table_core.c +1
-5@@ -360,12 +350,11 @@ static void flow_offload_del(struct nf_flowtable *flow_table, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); +flow_offload_fixup_ct (ct);Very unlikely, but race might still happen between fixup and clear
IPS_OFFLOAD_BITwith gc below?Quoted 5 lines
Without checking from the packet path, the conntrack gc might race to refresh the timeout, I don't see a 100% race free solution.
Probably update the
nf_ct_offload_timeoutto a shorter value than a day would mitigate this issue too.Quoted 8 lines
This section of the code is now protected by
IPS_OFFLOAD_TEARDOWN_BITwhich will prevent the update vianf_ct_offload_timeout.
We set it at the beginning offlow_offload_delandflow_offload_teardown.Since
flow_offload_teardownis only called on TCP packets we also need to set it atflow_offload_delto prevent the race.This should prevent the race at this point.
OK.
Quoted 29 lines
Quoted 29 lines
Quoted 21 lines
net/netfilter/nf_flow_table_core.c +4
-1+clear_bit (IPS_OFFLOAD_BIT , &ct->status); +clear_bit (IPS_OFFLOAD_TEARDOWN_BIT , &ct->status);flow_offload_free (flow); }@@ -373,8 +362,9 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) {set_bit (NF_FLOW_TEARDOWN , &flow->flags); +set_bit (IPS_OFFLOAD_TEARDOWN_BIT , &flow->ct->status); -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);net/netfilter/nft_flow_offload.c +0
-0net/netfilter/nft_flow_offload.c static void nft_flow_offload_eval(const struct nft_expr *expr, · line 299
Quoted 5 lines
net/netfilter/nft_flow_offload.c +2
-0@@ -295,6 +295,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr, sizeof(_tcph), &_tcph);if (unlikely (!tcph || tcph->fin || tcph->rst)) goto out; +if (unlikely (!nf_conntrack_tcp_established (ct))) + goto out;This chunk is not required, from ruleset users can do
Quoted 6 lines
Quoted 3 lines
... ct status assured ...
instead.
Maybe this should be mentioned in the manual or wiki if it is not necessary in the flow offload code.
Yes, documentation and wiki can be updated.
Quoted 7 lines
Quoted 2 lines
Users might want to offload the flow at a later stage in the TCP connection.
Well, actually there is not later stage than established, anything after established are TCP teardown states.
What's the issue with allowing to offload from
SYN_RECVstate?There were multiple problem in general with the code.
flow_offload_fixup_tcpalways moves a TCP connection to established even if it is in FIN or CLOSE.
Quoted 6 lines
The
flowoffload_delfunction was always setting the TCP timeout to ESTABLISHED timeout even when the state was in CLOSE and therefore creating a very long lasting dead state.Since we might miss or bump packets to slow path, we do not know what will happen there when we are still in
SYN_RECV.
Right.
Quoted 3 lines
We will have a better knowledge of the TCP state when we are in established first and we know that we are either still in it or we have moved past it to a closing state.
It makes sense to restrict this to TCP established only.
Oz and Paul already do this for tc-ct.
Thanks for explaining.
Quoted 45 lines · Pablo Neira Ayuso
Quoted 5 lines · Sven Auhagen
Quoted 4 lines · Pablo Neira Ayuso
Quoted 3 lines · Sven Auhagen
Quoted 2 lines · Pablo Neira Ayuso
Quoted 1 line · Pablo Neira Ayuso
On Thu, May 12, 2022 at 09:28:03PM +0300, Oz Shlomo wrote:
[...]
Quoted 38 lines
Quoted 37 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;Quoted 8 lines
Quoted 4 lines
Quoted 1 line
this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra
IPS_bit.You might create a race with ct gc that will remove the ct
if it is in close or end of close and before flow offload teardown is running so flow offload teardown might access memory that was freed.flow object holds a reference to the ct object until it is released, no use-after-free can happen.
Quoted 42 lines
Quoted 2 lines
Also if
nf_ct_deleteis called before flowtable delete? Can you let me know why?
nf_ct_delete()removes the conntrack object from lists and it decrements the reference counter by one.
flow_offload_free()also callsnf_ct_put().flow_offload_alloc()bumps the reference count on the conntrack object before creating the flow.Quoted 33 lines
Quoted 18 lines
Quoted 11 lines
It is not a very likely scenario but never the less it might happen now since the
IPS_OFFLOAD_BITis not set and the state might just time out.If someone sets a very small TCP CLOSE timeout it gets more likely.
So Oz and myself were debatting about three possible cases/problems:
1. ct gc sets timeout even though the state is in CLOSE/FIN because the
IPS_OFFLOADis still set but the flow is in teardown
2. ct gc removes the ct because theIPS_OFFLOADis not set and the CLOSE timeout is reached before the flow offload delOK.
Quoted 4 lines
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state is already CLOSED.
Quoted 5 lines
Quoted 3 lines
Also as a remark we can not assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
I assume this remark is related to 3.?
Yes, exactly.
Quoted 2 lines
if
IPS_OFFLOADis unset, then conntrack would update the state according to this FIN or RST.It will move to a different TCP state anyways only the ct state will be at
IPS_OFFLOAD_BITand prevent it from beeing garbage collected. The timeout will be bumped back up as long asIPS_OFFLOAD_BITis set even though TCP might already be CLOSED.
I see what you are trying to do here, I have some remarks:
Quoted 25 lines
If teardown fixes the ct state and timeout to established, and
IPS_OFFLOADis unset, then the packet is passed up in a consistent state.I made a patch, it is based on yours, it's attached:
- If flow timeout expires or rst/fin is seen, ct state and timeout is fixed up (to established state) and
IPS_OFFLOADis unset.- If rst/fin packet is seen, ct state and timeout is fixed up (to established state) and
IPS_OFFLOADis unset. The packet continues its travel up to the classic path, so conntrack triggers the transition from established to one of the close states.For the case 1.,
IPS_OFFLOADis not set anymore, so conntrack gc cannot race to reset the ct timeout anymore.For the case 2., if gc conntrack ever removes the ct entry, then the
IPS_DYINGbit is set, which implicitly triggers the teardown state from the flowtable gc. The flowtable still holds a reference to the ct object, so no UAF can happen.For the case 3. the conntrack is set to ESTABLISHED with a long timeout, yes. This is to deal with the two possible cases:
Quoted 7 lines
a) flowtable timeout expired, so conntrack recovers control on the flow.
b) tcp rst/fin will take back the packet to slow path. The ct has been fixed up to established state so it will trasition to one of the close states.Am I missing anything?
You should not fixup the tcp state back to established.
If flow_offload_teardown is not called because a packet got bumped up to the slow path and you call flow_offload_teardown from nf_flow_offload_gc_step, the tcp state might already be in CLOSE state and you just moved it back to established.
The entire function flow_offload_fixup_tcp can go away if we only allow established tcp states in the flowtable.
Same goes for the timeout. The timeout should really be set to the current tcp state ct->proto.tcp->state which might not be established anymore.
For me the question remains, why can the ct gc not remove the ct when nf_ct_delete is called before flow_offload_del is called?
Also you probably want to move the IPS_OFFLOAD_BIT to the beginning of flow_offload_teardown just to make sure that the ct gc is not bumping up the ct timeout while it is changed in flow_offload_fixup_ct.
Pablo Neira Ayuso
maintainerQuoted 122 lines · Sven Auhagen
Quoted 45 lines · Pablo Neira Ayuso
Quoted 5 lines · Sven Auhagen
Quoted 4 lines · Pablo Neira Ayuso
Quoted 3 lines · Sven Auhagen
Quoted 2 lines · Pablo Neira Ayuso
Quoted 1 line · Pablo Neira Ayuso
On Thu, May 12, 2022 at 09:28:03PM +0300, Oz Shlomo wrote:
[...]
Quoted 38 lines
Quoted 37 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;Quoted 8 lines
Quoted 4 lines
Quoted 1 line
this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra
IPS_bit.You might create a race with ct gc that will remove the ct
if it is in close or end of close and before flow offload teardown is running so flow offload teardown might access memory that was freed.flow object holds a reference to the ct object until it is released, no use-after-free can happen.
Quoted 42 lines
Quoted 2 lines
Also if
nf_ct_deleteis called before flowtable delete? Can you let me know why?
nf_ct_delete()removes the conntrack object from lists and it decrements the reference counter by one.
flow_offload_free()also callsnf_ct_put().flow_offload_alloc()bumps the reference count on the conntrack object before creating the flow.Quoted 33 lines
Quoted 18 lines
Quoted 11 lines
It is not a very likely scenario but never the less it might happen now since the
IPS_OFFLOAD_BITis not set and the state might just time out.If someone sets a very small TCP CLOSE timeout it gets more likely.
So Oz and myself were debatting about three possible cases/problems:
1. ct gc sets timeout even though the state is in CLOSE/FIN because the
IPS_OFFLOADis still set but the flow is in teardown
2. ct gc removes the ct because theIPS_OFFLOADis not set and the CLOSE timeout is reached before the flow offload delOK.
Quoted 4 lines
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state is already CLOSED.
Quoted 5 lines
Quoted 3 lines
Also as a remark we can not assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
I assume this remark is related to 3.?
Yes, exactly.
Quoted 2 lines
if
IPS_OFFLOADis unset, then conntrack would update the state according to this FIN or RST.It will move to a different TCP state anyways only the ct state will be at
IPS_OFFLOAD_BITand prevent it from beeing garbage collected. The timeout will be bumped back up as long asIPS_OFFLOAD_BITis set even though TCP might already be CLOSED.I see what you are trying to do here, I have some remarks:
Quoted 31 lines
If teardown fixes the ct state and timeout to established, and
IPS_OFFLOADis unset, then the packet is passed up in a consistent state.I made a patch, it is based on yours, it's attached:
- If flow timeout expires or rst/fin is seen, ct state and timeout is fixed up (to established state) and
IPS_OFFLOADis unset.- If rst/fin packet is seen, ct state and timeout is fixed up (to established state) and
IPS_OFFLOADis unset. The packet continues its travel up to the classic path, so conntrack triggers the transition from established to one of the close states.For the case 1.,
IPS_OFFLOADis not set anymore, so conntrack gc cannot race to reset the ct timeout anymore.For the case 2., if gc conntrack ever removes the ct entry, then the
IPS_DYINGbit is set, which implicitly triggers the teardown state from the flowtable gc. The flowtable still holds a reference to the ct object, so no UAF can happen.For the case 3. the conntrack is set to ESTABLISHED with a long timeout, yes. This is to deal with the two possible cases:
a) flowtable timeout expired, so conntrack recovers control on the flow.
b) tcp rst/fin will take back the packet to slow path. The ct has been fixed up to established state so it will trasition to one of the close states.
Quoted 6 lines
Quoted 1 line
Am I missing anything?
You should not fixup the tcp state back to established.
Ifflow_offload_teardownis not called because a packet got bumped up to the slow path and you callflow_offload_teardownfromnf_flow_offload_gc_step, the tcp state might already be in CLOSE state and you just moved it back to established.
OK.
Quoted 2 lines
The entire function
flow_offload_fixup_tcpcan go away if we only allow established tcp states in the flowtable.
I'm keeping it, but I remove the reset of the tcp state.
Quoted 2 lines
Same goes for the timeout. The timeout should really be set to the current tcp state
ct->proto.tcp->statewhich might not be established anymore.
OK.
Quoted 2 lines
For me the question remains, why can the ct gc not remove the ct when
nf_ct_deleteis called beforeflow_offload_delis called?
nf_ct_delete() removes indeed the entry from the conntrack table, then it calls nf_ct_put() which decrements the refcnt. Given that the flowtable holds a reference to the conntrack object...
struct flow_offload *flow_offload_alloc(struct nf_conn *ct)
{
struct flow_offload *flow;
if (unlikely(nf_ct_is_dying(ct) ||
!refcount_inc_not_zero(&ct->ct_general.use)))
return NULL;... use-after-free cannot happen. Note that flow_offload_free() calls nf_ct_put(flow->ct), so at this point the ct object is released.
Is this your concern?
Quoted 3 lines
Also you probably want to move the
IPS_OFFLOAD_BITto the beginning offlow_offload_teardownjust to make sure that the ct gc is not bumping up the ct timeout while it is changed inflow_offload_fixup_ct.
Done.
See patch attached.
Quoted 2 lines
net/netfilter/nf_flow_table_core.c +7 -26
@@ -179,12 +179,11 @@ EXPORT_SYMBOL_GPL(flow_offload_route_init);static void flow_offload_fixup_tcp (struct ip_ct_tcp *tcp) { - tcp->state =TCP_CONNTRACK_ESTABLISHED ; tcp->seen[0 ].td_maxwin =0 ; tcp->seen[1 ].td_maxwin =0 ; } -static void flow_offload_fixup_ct_timeout (struct nf_conn *ct) +static void flow_offload_fixup_ct (struct nf_conn *ct) {struct net *net =nf_ct_net (ct);int l4num =nf_ct_protonum (ct);
@@ -193,7 +192,9 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)if (l4num ==IPPROTO_TCP ) {struct nf_tcp_net *tn =nf_tcp_pernet (net); - timeout = tn->timeouts[TCP_CONNTRACK_ESTABLISHED ]; +flow_offload_fixup_tcp (&ct->proto.tcp); + + timeout = tn->timeouts[ct->proto.tcp.state]; timeout -= tn->offload_timeout; }else if (l4num ==IPPROTO_UDP ) {struct nf_udp_net *tn =nf_udp_pernet (net);
@@ -211,18 +212,6 @@ static void flow_offload_fixup_ct_timeout(struct nf_conn *ct)WRITE_ONCE (ct->timeout, nfct_time_stamp + timeout); } -static void flow_offload_fixup_ct_state (struct nf_conn *ct) -{ -if (nf_ct_protonum (ct) ==IPPROTO_TCP ) -flow_offload_fixup_tcp (&ct->proto.tcp); -} - -static void flow_offload_fixup_ct (struct nf_conn *ct) -{ -flow_offload_fixup_ct_state (ct); -flow_offload_fixup_ct_timeout (ct); -} -static void flow_offload_route_release (struct flow_offload *flow) {nft_flow_dst_release (flow,FLOW_OFFLOAD_DIR_ORIGINAL );
@@ -361,22 +350,14 @@ static void flow_offload_del(struct nf_flowtable *flow_table,rhashtable_remove_fast (&flow_table->rhashtable, &flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].node, nf_flow_offload_rhash_params); - -clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status); - -if (nf_flow_has_expired (flow)) -flow_offload_fixup_ct (flow->ct); -else -flow_offload_fixup_ct_timeout (flow->ct); -flow_offload_free (flow); }void flow_offload_teardown (struct flow_offload *flow) { +clear_bit (IPS_OFFLOAD_BIT , &flow->ct->status);set_bit (NF_FLOW_TEARDOWN , &flow->flags); - -flow_offload_fixup_ct_state (flow->ct); +flow_offload_fixup_ct (flow->ct); }EXPORT_SYMBOL_GPL (flow_offload_teardown);
@@ -466,7 +447,7 @@ static void nf_flow_offload_gc_step(struct nf_flowtable *flow_table,if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) ||nf_flow_has_stale_dst (flow)) -set_bit (NF_FLOW_TEARDOWN , &flow->flags); +flow_offload_teardown (flow);if (test_bit (NF_FLOW_TEARDOWN , &flow->flags)) {if (test_bit (NF_FLOW_HW , &flow->flags)) {
net/netfilter/nft_flow_offload.c +2 -1
@@ -298,7 +298,8 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,case IPPROTO_TCP : tcph =skb_header_pointer (pkt->skb,nft_thoff (pkt),sizeof (_tcph), &_tcph); -if (unlikely (!tcph || tcph->fin || tcph->rst)) +if (unlikely (!tcph || tcph->fin || tcph->rst || +nf_conntrack_tcp_established (&ct->proto.tcp))) goto out;break ;case IPPROTO_UDP :
Quoted 157 lines · Pablo Neira Ayuso
Quoted 122 lines · Sven Auhagen
Quoted 45 lines · Pablo Neira Ayuso
Quoted 5 lines · Sven Auhagen
Quoted 4 lines · Pablo Neira Ayuso
Quoted 3 lines · Sven Auhagen
Quoted 2 lines · Pablo Neira Ayuso
Quoted 1 line · Pablo Neira Ayuso
On Thu, May 12, 2022 at 09:28:03PM +0300, Oz Shlomo wrote:
[...]
Quoted 38 lines
Quoted 37 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
[...]
net/netfilter/nf_conntrack_core.c static void gc_worker(struct work_struct *work) · line 1480
Quoted 9 lines
net/netfilter/nf_conntrack_core.c +0
-1@@ -1477,7 +1477,8 @@ static void gc_worker(struct work_struct *work) tmp =nf_ct_tuplehash_to_ctrack (h);if (test_bit (IPS_OFFLOAD_BIT , &tmp->status)) { -nf_ct_offload_timeout (tmp);Hm, it is the trick to avoid checking for
IPS_OFFLOADfrom the packet path that triggers the race, ie.nf_ct_is_expired()The flowtable ct fixup races with conntrack gc collector.
Clearing
IPS_OFFLOADmight result in offloading the entry again for the closing packets.Probably clear
IPS_OFFLOADfrom teardown, and skip offload if flow is in a TCP state that represent closure?if (unlikely(!tcph || tcph->fin || tcph->rst)) goto out;Quoted 8 lines
Quoted 4 lines
Quoted 1 line
this is already the intention in the existing code.
I'm attaching an incomplete sketch patch. My goal is to avoid the extra
IPS_bit.You might create a race with ct gc that will remove the ct
if it is in close or end of close and before flow offload teardown is running so flow offload teardown might access memory that was freed.flow object holds a reference to the ct object until it is released, no use-after-free can happen.
Quoted 42 lines
Quoted 2 lines
Also if
nf_ct_deleteis called before flowtable delete? Can you let me know why?
nf_ct_delete()removes the conntrack object from lists and it decrements the reference counter by one.
flow_offload_free()also callsnf_ct_put().flow_offload_alloc()bumps the reference count on the conntrack object before creating the flow.Quoted 33 lines
Quoted 18 lines
Quoted 11 lines
It is not a very likely scenario but never the less it might happen now since the
IPS_OFFLOAD_BITis not set and the state might just time out.If someone sets a very small TCP CLOSE timeout it gets more likely.
So Oz and myself were debatting about three possible cases/problems:
1. ct gc sets timeout even though the state is in CLOSE/FIN because the
IPS_OFFLOADis still set but the flow is in teardown
2. ct gc removes the ct because theIPS_OFFLOADis not set and the CLOSE timeout is reached before the flow offload delOK.
Quoted 4 lines
3. tcp ct is always set to ESTABLISHED with a very long timeout in flow offload teardown/delete even though the state is already CLOSED.
Quoted 5 lines
Quoted 3 lines
Also as a remark we can not assume that the FIN or RST packet is hitting flow table teardown as the packet might get bumped to the slow path in nftables.
I assume this remark is related to 3.?
Yes, exactly.
Quoted 2 lines
if
IPS_OFFLOADis unset, then conntrack would update the state according to this FIN or RST.It will move to a different TCP state anyways only the ct state will be at
IPS_OFFLOAD_BITand prevent it from beeing garbage collected. The timeout will be bumped back up as long asIPS_OFFLOAD_BITis set even though TCP might already be CLOSED.I see what you are trying to do here, I have some remarks:
Quoted 31 lines
If teardown fixes the ct state and timeout to established, and
IPS_OFFLOADis unset, then the packet is passed up in a consistent state.I made a patch, it is based on yours, it's attached:
- If flow timeout expires or rst/fin is seen, ct state and timeout is fixed up (to established state) and
IPS_OFFLOADis unset.- If rst/fin packet is seen, ct state and timeout is fixed up (to established state) and
IPS_OFFLOADis unset. The packet continues its travel up to the classic path, so conntrack triggers the transition from established to one of the close states.For the case 1.,
IPS_OFFLOADis not set anymore, so conntrack gc cannot race to reset the ct timeout anymore.For the case 2., if gc conntrack ever removes the ct entry, then the
IPS_DYINGbit is set, which implicitly triggers the teardown state from the flowtable gc. The flowtable still holds a reference to the ct object, so no UAF can happen.For the case 3. the conntrack is set to ESTABLISHED with a long timeout, yes. This is to deal with the two possible cases:
a) flowtable timeout expired, so conntrack recovers control on the flow.
b) tcp rst/fin will take back the packet to slow path. The ct has been fixed up to established state so it will trasition to one of the close states.Quoted 6 lines
Quoted 1 line
Am I missing anything?
You should not fixup the tcp state back to established.
Ifflow_offload_teardownis not called because a packet got bumped up to the slow path and you callflow_offload_teardownfromnf_flow_offload_gc_step, the tcp state might already be in CLOSE state and you just moved it back to established.OK.
Quoted 2 lines
The entire function
flow_offload_fixup_tcpcan go away if we only allow established tcp states in the flowtable.I'm keeping it, but I remove the reset of the tcp state.
Quoted 2 lines
Same goes for the timeout. The timeout should really be set to the current tcp state
ct->proto.tcp->statewhich might not be established anymore.OK.
Quoted 2 lines
For me the question remains, why can the ct gc not remove the ct when
nf_ct_deleteis called beforeflow_offload_delis called?
nf_ct_delete()removes indeed the entry from the conntrack table, then it callsnf_ct_put()which decrements the refcnt. Given that the flowtable holds a reference to the conntrack object...struct
flow_offload*flow_offload_alloc(structnf_conn*ct){ struct flow_offload *flow; if (unlikely(nf_ct_is_dying(ct) || !refcount_inc_not_zero(&ct->ct_general.use))) return NULL;
Quoted 4 lines
... use-after-free cannot happen. Note that
flow_offload_free()callsnf_ct_put(flow->ct), so at this point the ct object is released.Is this your concern?
Ah yes, thank you.
I did not catch the refcount_inc_not_zero call.
Quoted 10 lines
Quoted 4 lines
Also you probably want to move the
IPS_OFFLOAD_BITto the beginning offlow_offload_teardownjust to make sure that the ct gc is not bumping up the ct timeout while it is changed inflow_offload_fixup_ct.Done.
See patch attached.
Quoted 2 lines
The patch looks good to me, one remark.
This has to be
- if (unlikely(!tcph || tcph->fin || tcph->rst)) + if (unlikely(!tcph || tcph->fin || tcph->rst ||
+ !nf_conntrack_tcp_established(&ct->proto.tcp)))
goto out;
You are currently go to out if the tcp state is established but you want the opposite, not established.
I think this will cover all cases.
Best
Sven