netfilter: conntrack: fix wrong ct->timeout value
Subsystems (2)
PATCH v3 1/1 netfilter: conntrack: fix wrong ct->timeout value
(struct nf_conn)->timeout is an interval before the conntrack confirmed. After confirmed, it becomes a timestamp[1].
It is observed that timeout of an unconfirmed conntrack:
- Set by calling ctnetlink_change_timeout(). As a result, nfct_time_stamp was wrongly added to ct->timeout twice[2].
- Get by calling ctnetlink_dump_timeout(). As a result, nfct_time_stamp was wrongly subtracted[3].
Separate the 2 cases in:
- Setting ct->timeout in __nf_ct_set_timeout().
- Getting ct->timeout in ctnetlink_dump_timeout().
[1]: https://elixir.bootlin.com/linux/v6.3-rc5/source/net/netfilter/nf_conntrack_core.c#L1257
[2]: https://elixir.bootlin.com/linux/v6.3-rc5/source/include/net/netfilter/nf_conntrack_core.h#L92
[3]: https://elixir.bootlin.com/linux/v6.3-rc5/source/include/net/netfilter/nf_conntrack.h#L296
---
Changes from v2 (https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/):
- Revert to v1 and apply partial changes per discussion thread in v1.
- Don't use WRITE_ONCE() and READ_ONCE() on unconfirmed conntrack.
Changes from v1 (https://patchwork.ozlabs.org/project/netfilter-devel/patch/[email protected]/):
- Just skip updating if the conntrack is unconfirmed per review comment.
include/net/netfilter/nf_conntrack_core.h | 6 +++++- net/netfilter/nf_conntrack_netlink.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-)
include/net/netfilter/nf_conntrack_core.h +5 -1
@@ -89,7 +89,11 @@ static inline void __nf_ct_set_timeout(struct nf_conn *ct, u64 timeout) {if (timeout >INT_MAX ) timeout =INT_MAX ; -WRITE_ONCE (ct->timeout, nfct_time_stamp + (u32 )timeout); + +if (nf_ct_is_confirmed (ct)) +WRITE_ONCE (ct->timeout, nfct_time_stamp + (u32 )timeout); +else + ct->timeout = (u32 )timeout; }int __nf_ct_change_timeout (struct nf_conn *ct,u64 cta_timeout);
net/netfilter/nf_conntrack_netlink.c +6 -1
@@ -176,7 +176,12 @@ static int ctnetlink_dump_status(struct sk_buff *skb, const struct nf_conn *ct)static int ctnetlink_dump_timeout (struct sk_buff *skb,const struct nf_conn *ct,bool skip_zero) { -long timeout =nf_ct_expires (ct) /HZ ; +long timeout; + +if (nf_ct_is_confirmed (ct)) + timeout =nf_ct_expires (ct) /HZ ; +else + timeout = ct->timeout /HZ ;if (skip_zero && timeout ==0 )return 0 ;
Signature · 1 line
2.40.0.396.gfff15efe05-goog
Quoted 9 lines · Tzung-Bi Shih
(struct nf_conn)->timeout is an interval before the conntrack confirmed. After confirmed, it becomes a timestamp[1].
It is observed that timeout of an unconfirmed conntrack:
- Set by callingctnetlink_change_timeout(). As a result,nfct_time_stampwas wrongly added toct->timeouttwice[2].
- Get by callingctnetlink_dump_timeout(). As a result,nfct_time_stampwas wrongly subtracted[3].
Quoted 3 lines
Separate the 2 cases in:
- Settingct->timeoutin__nf_ct_set_timeout().
- Gettingct->timeoutinctnetlink_dump_timeout().
Applied, thanks
Pablo Neira Ayuso
maintainerQuoted 10 lines · Pablo Neira Ayuso
Quoted 9 lines · Tzung-Bi Shih
(struct nf_conn)->timeout is an interval before the conntrack confirmed. After confirmed, it becomes a timestamp[1].
It is observed that timeout of an unconfirmed conntrack:
- Set by callingctnetlink_change_timeout(). As a result,nfct_time_stampwas wrongly added toct->timeouttwice[2].
- Get by callingctnetlink_dump_timeout(). As a result,nfct_time_stampwas wrongly subtracted[3].
Quoted 5 lines
Quoted 3 lines
Separate the 2 cases in:
- Settingct->timeoutin__nf_ct_set_timeout().
- Gettingct->timeoutinctnetlink_dump_timeout().Applied, thanks
I have to amend this patch, I have to collapsed the attached chunk. Otherwise conntrack creation via ctnetlink breaks.
net/netfilter/nf_conntrack_netlink.c +3 -3
@@ -2253,9 +2253,6 @@ ctnetlink_create_conntrack(struct net *net,if (!cda[CTA_TIMEOUT ]) goto err1; - timeout = (u64 )ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])) *HZ ; -__nf_ct_set_timeout (ct, timeout); -rcu_read_lock ();if (cda[CTA_HELP ]) {char *helpname =NULL ;
@@ -2319,6 +2316,9 @@ ctnetlink_create_conntrack(struct net *net,/* we must add conntrack extensions before confirmation. */ ct->status |=IPS_CONFIRMED ; + timeout = (u64 )ntohl (nla_get_be32 (cda[CTA_TIMEOUT ])) *HZ ; +__nf_ct_set_timeout (ct, timeout); +if (cda[CTA_STATUS ]) { err =ctnetlink_change_status (ct, cda);if (err <0 )