netfilter: nf_tables: GC transaction race with abort path
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: GC transaction race with abort path
Abort path is missing a synchronization point with GC transactions. Add GC sequence number hence any GC transaction losing race will be discarded.
--- net/netfilter/nf_tables_api.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +5 -1
@@ -10335,8 +10335,12 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb, enum nfnl_abort_action action) {struct nftables_pernet *nft_net =nft_pernet (net); -int ret =__nf_tables_abort (net, action); +unsigned int gc_seq; +int ret; + gc_seq =nft_gc_seq_begin (nft_net); + ret =__nf_tables_abort (net, action); +nft_gc_seq_end (nft_net, gc_seq);mutex_unlock (&nft_net->commit_mutex);return ret;
Signature · 1 line
2.30.2
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Pablo,
kernel test robot noticed the following build errors:
[auto build test ERROR on nf/master]
url: https://github.com/intel-lab-lkp/linux/commits/Pablo-Neira-Ayuso/netfilter-nf_tables-GC-transaction-race-with-abort-path/20230818-071545 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master patch link: https://lore.kernel.org/r/20230817231352.8412-1-pablo%40netfilter.org patch subject: [PATCH nf] netfilter: nf_tables: GC transaction race with abort path config: hexagon-randconfig-r045-20230818 (https://download.01.org/0day-ci/archive/20230818/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) reproduce: (https://download.01.org/0day-ci/archive/20230818/[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 errors (new ones prefixed by >>):
>> net/netfilter/nf_tables_api.c:9132:11: error: call to undeclared function 'nft_gc_seq_begin'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
9132 | gc_seq = nft_gc_seq_begin(nft_net);
| ^
>> net/netfilter/nf_tables_api.c:9134:2: error: call to undeclared function 'nft_gc_seq_end'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
9134 | nft_gc_seq_end(nft_net, gc_seq);
| ^2 errors generated.
vim +/nft_gc_seq_begin +9132 net/netfilter/nf_tables_api.c
9124
9125 static int nf_tables_abort(struct net *net, struct sk_buff *skb,
9126 enum nfnl_abort_action action)
9127 {
9128 struct nftables_pernet *nft_net = nft_pernet(net);
9129 unsigned int gc_seq;
9130 int ret;
9131
> 9132 gc_seq = nft_gc_seq_begin(nft_net); 9133 ret = __nf_tables_abort(net, action); > 9134 nft_gc_seq_end(nft_net, gc_seq);
9135 mutex_unlock(&nft_net->commit_mutex);
9136
9137 return ret;
9138 }
9139
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Pablo Neira Ayuso
maintainerQuoted 8 lines · kernel test robot
Hi Pablo,
kernel test robot noticed the following build errors:
[auto build test ERROR on nf/master]
url: https://github.com/intel-lab-lkp/linux/commits/Pablo-Neira-Ayuso/netfilter-nf_tables-GC-transaction-race-with-abort-path/20230818-071545 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git master
Wrong tree, we moved to:
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git main
Quoted 7 lines · Pablo Neira Ayuso
Quoted 6 lines · kernel test robot
Hi Pablo,
kernel test robot noticed the following build errors:
[auto build test ERROR on nf/master]
Quoted 8 lines
Quoted 4 lines
url:
https://github.com/intel-lab-lkp/linux/commits/Pablo-Neira-Ayuso/netfilter-nf_tables-GC-transaction-race-with-abort-path/20230818-071545
base:
https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git masterWrong tree, we moved to:
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git main
Thanks for the info and sorry for the wrong report. We've configured the bot to test netfilter patches against the new tree.
--
Best Regards,
Yujie
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Pablo,
kernel test robot noticed the following build errors:
[auto build test ERROR on nf/master]
url: https://github.com/intel-lab-lkp/linux/commits/Pablo-Neira-Ayuso/netfilter-nf_tables-GC-transaction-race-with-abort-path/20230818-071545 base: master patch link: https://lore.kernel.org/r/20230817231352.8412-1-pablo%40netfilter.org patch subject: [PATCH nf] netfilter: nf_tables: GC transaction race with abort path config: x86_64-rhel-8.3 (https://download.01.org/0day-ci/archive/20230821/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce: (https://download.01.org/0day-ci/archive/20230821/[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 errors (new ones prefixed by >>):
net/netfilter/nf_tables_api.c: In function 'nf_tables_abort':
>> net/netfilter/nf_tables_api.c:9132:18: error: implicit declaration of function 'nft_gc_seq_begin' [-Werror=implicit-function-declaration]
9132 | gc_seq = nft_gc_seq_begin(nft_net);
| ^~~~~~~~~~~~~~~~
>> net/netfilter/nf_tables_api.c:9134:9: error: implicit declaration of function 'nft_gc_seq_end'; did you mean 'nft_get_set_elem'? [-Werror=implicit-function-declaration]
9134 | nft_gc_seq_end(nft_net, gc_seq);
| ^~~~~~~~~~~~~~
| nft_get_set_elemcc1: some warnings being treated as errors
vim +/nft_gc_seq_begin +9132 net/netfilter/nf_tables_api.c
9124
9125 static int nf_tables_abort(struct net *net, struct sk_buff *skb,
9126 enum nfnl_abort_action action)
9127 {
9128 struct nftables_pernet *nft_net = nft_pernet(net);
9129 unsigned int gc_seq;
9130 int ret;
9131
> 9132 gc_seq = nft_gc_seq_begin(nft_net); 9133 ret = __nf_tables_abort(net, action); > 9134 nft_gc_seq_end(nft_net, gc_seq);
9135 mutex_unlock(&nft_net->commit_mutex);
9136
9137 return ret;
9138 }
9139
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Pablo Neira Ayuso
maintainerHi,
Quoted 5 lines · kernel test robot
Hi Pablo,
kernel test robot noticed the following build errors:
[auto build test ERROR on nf/master]
nf.git tree has no master branch, but it has a main branch.
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git/log/?h=main
This report does not say what tree is beind used but it still looks like this is the wrong tree.
Quoted 48 lines
url: https://github.com/intel-lab-lkp/linux/commits/Pablo-Neira-Ayuso/netfilter-nf_tables-GC-transaction-race-with-abort-path/20230818-071545 base: master patch link: https://lore.kernel.org/r/20230817231352.8412-1-pablo%40netfilter.org patch subject: [PATCH nf] netfilter: nf_tables: GC transaction race with abort path config: x86_64-rhel-8.3 (https://download.01.org/0day-ci/archive/20230821/[email protected]/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce: (https://download.01.org/0day-ci/archive/20230821/[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 errors (new ones prefixed by >>):
net/netfilter/nf_tables_api.c: In function 'nf_tables_abort':Quoted 1 line
Quoted 1 line
net/netfilter/nf_tables_api.c:9132:18: error: implicit declaration of function 'nft_gc_seq_begin' [-Werror=implicit-function-declaration]9132 | gc_seq = nft_gc_seq_begin(nft_net); | ^~~~~~~~~~~~~~~~Quoted 1 line
Quoted 1 line
net/netfilter/nf_tables_api.c:9134:9: error: implicit declaration of function 'nft_gc_seq_end'; did you mean 'nft_get_set_elem'? [-Werror=implicit-function-declaration]9134 | nft_gc_seq_end(nft_net, gc_seq); | ^~~~~~~~~~~~~~ | nft_get_set_elemcc1: some warnings being treated as errors
vim +/nft_gc_seq_begin +9132
net/netfilter/nf_tables_api.c9124
9125 static int nf_tables_abort(struct net *net, structsk_buff*skb,
9126 enumnfnl_abort_actionaction)
9127 {
9128 structnftables_pernet*nft_net=nft_pernet(net);
9129 unsigned intgc_seq;
9130 int ret;
9131Quoted 1 line
9132
gc_seq=nft_gc_seq_begin(nft_net);9133 ret =
__nf_tables_abort(net, action);Quoted 1 line
9134
nft_gc_seq_end(nft_net, gc_seq);9135
mutex_unlock(&nft_net->commit_mutex);
9136
9137 return ret;
9138 }
9139Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki