netfilter: nft_ct: support expectation creation for natted flows
Subsystems (2)
Florian Westphal
maintainerPATCH v3 1/1 netfilter: nft_ct: support expectation creation for natted flows
This feature only works for connections originating from the host and only if there no source address rewrite.
Add the needed nat glue to have the expectation follow the original nat binding.
---
v3: use struct nf_ct_helper_expectfn for this. Compared to v2 this means dumping and restoring the expfn via ctnetlink will work. nf_ct_helper_expectfn_destroy() will zap any expectations that use nft_ct_nat_follow_master, so no need to call the iterator directly as in v2.
net/netfilter/nft_ct.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
net/netfilter/nft_ct.c +33 -0
@@ -1297,6 +1297,17 @@ static int nft_ct_expect_obj_dump(struct sk_buff *skb,return 0 ; } +#if IS_ENABLED (CONFIG_NF_NAT ) +static void nft_ct_nat_follow_master (struct nf_conn *ct,struct nf_conntrack_expect *this) +{ +const struct nf_ct_helper_expectfn *expfn; + + expfn =nf_ct_helper_expectfn_find_by_name ("nat-follow-master" ); +if (expfn) + expfn->expectfn (ct, this); +} +#endif +static void nft_ct_expect_obj_eval (struct nft_object *obj,struct nft_regs *regs,const struct nft_pktinfo *pkt)
@@ -1342,6 +1353,13 @@ static void nft_ct_expect_obj_eval(struct nft_object *obj, priv->l4proto, NULL, &priv->dport); exp->timeout += priv->timeout; +#if IS_ENABLED (CONFIG_NF_NAT ) +if (ct->status &IPS_NAT_MASK ) { + exp->saved_proto.tcp.port = priv->dport; + exp->dir = !dir; + exp->expectfn = nft_ct_nat_follow_master; + } +#endif if (nf_ct_expect_related (exp,0 ) !=0 ) regs->verdict.code =NF_DROP ;
@@ -1375,6 +1393,11 @@ static struct nft_object_type nft_ct_expect_obj_type __read_mostly = { .owner = THIS_MODULE, }; +static struct nf_ct_helper_expectfn nft_ct_nat__read_mostly = { + .name ="nft_ct-follow-master" , + .expectfn = nft_ct_nat_follow_master, +}; +static int __init nft_ct_module_init (void ) {int err;
@@ -1400,6 +1423,9 @@ static int __init nft_ct_module_init(void) err =nft_register_obj (&nft_ct_timeout_obj_type);if (err <0 ) goto err4; +#endif +#if IS_ENABLED (CONFIG_NF_NAT ) +nf_ct_helper_expectfn_register (&nft_ct_nat);#endif return 0 ;
@@ -1425,6 +1451,13 @@ static void __exit nft_ct_module_exit(void)nft_unregister_obj (&nft_ct_helper_obj_type);nft_unregister_expr (&nft_notrack_type);nft_unregister_expr (&nft_ct_type); + +#if IS_ENABLED (CONFIG_NF_NAT ) +nf_ct_helper_expectfn_unregister (&nft_ct_nat); +synchronize_rcu (); +nf_ct_helper_expectfn_destroy (&nft_ct_nat); +synchronize_rcu (); +#endif }module_init (nft_ct_module_init);
Signature · 1 line
2.53.0
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Florian,
kernel test robot noticed the following build errors:
[auto build test ERROR on netfilter-nf/main]
url: https://github.com/intel-lab-lkp/linux/commits/Florian-Westphal/netfilter-nft_ct-support-expectation-creation-for-natted-flows/20260701-031657 base: https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git main patch link: https://lore.kernel.org/r/20260630190929.14735-1-fw%40strlen.de patch subject: [PATCH v3 nf] netfilter: nft_ct: support expectation creation for natted flows config: arc-randconfig-002-20260701 (https://download.01.org/0day-ci/archive/20260701/[email protected]/config) compiler: arc-linux-gcc (GCC) 8.5.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260701/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All error/warnings (new ones prefixed by >>):
>> net/netfilter/nft_ct.c:1398:14: error: 'nft_ct_nat_follow_master' undeclared here (not in a function); did you mean 'nft_ct_get_eval_counter'?
.expectfn = nft_ct_nat_follow_master,
^~~~~~~~~~~~~~~~~~~~~~~~
nft_ct_get_eval_counter
>> net/netfilter/nft_ct.c:1396:37: warning: 'nft_ct_nat' defined but not used [-Wunused-variable]
static struct nf_ct_helper_expectfn nft_ct_nat __read_mostly = {
^~~~~~~~~~vim +1398 net/netfilter/nft_ct.c
1395
> 1396 static struct nf_ct_helper_expectfn nft_ct_nat __read_mostly = {
1397 .name = "nft_ct-follow-master",
> 1398 .expectfn = nft_ct_nat_follow_master, 1399 };
1400
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki