korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 20:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: release batch on table validation from abort path

Browse Source 
Unlike early commit path stage which triggers a call to abort, an
explicit release of the batch is required on abort, otherwise mutex is
released and commit_list remains in place.

Add WARN_ON_ONCE to ensure commit_list is empty from the abort path
before releasing the mutex.

After this patch, commit_list is always assumed to be empty before
grabbing the mutex, therefore

  03c1f1ef15 ("netfilter: Cleanup nft_net->module_list from nf_tables_exit_net()")

only needs to release the pending modules for registration.

Cc: stable@vger.kernel.org
Fixes: c0391b6ab8 ("netfilter: nf_tables: missing validation from the abort path")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2024-03-28 13:27:36 +01:00
parent 72076fc9fe
commit a45e688957
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/netfilter/nf_tables_api.c
View File

@ -10455,10 +10455,11 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
struct nft_trans *trans, *next; struct nft_trans *trans, *next;
LIST_HEAD(set_update_list); LIST_HEAD(set_update_list);
struct nft_trans_elem *te; struct nft_trans_elem *te;
int err = 0;
if (action == NFNL_ABORT_VALIDATE && if (action == NFNL_ABORT_VALIDATE &&
nf_tables_validate(net) < 0) nf_tables_validate(net) < 0)
return -EAGAIN; err = -EAGAIN;
list_for_each_entry_safe_reverse(trans, next, &nft_net->commit_list, list_for_each_entry_safe_reverse(trans, next, &nft_net->commit_list,
list) { list) {
@ -10655,7 +10656,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)
else else
nf_tables_module_autoload_cleanup(net); nf_tables_module_autoload_cleanup(net);
return 0; return err;
} }
static int nf_tables_abort(struct net *net, struct sk_buff *skb, static int nf_tables_abort(struct net *net, struct sk_buff *skb,
@ -10668,6 +10669,9 @@ static int nf_tables_abort(struct net *net, struct sk_buff *skb,
gc_seq = nft_gc_seq_begin(nft_net); gc_seq = nft_gc_seq_begin(nft_net);
ret = __nf_tables_abort(net, action); ret = __nf_tables_abort(net, action);
nft_gc_seq_end(nft_net, gc_seq); nft_gc_seq_end(nft_net, gc_seq);
WARN_ON_ONCE(!list_empty(&nft_net->commit_list));
mutex_unlock(&nft_net->commit_mutex); mutex_unlock(&nft_net->commit_mutex);
return ret; return ret;
@ -11473,9 +11477,10 @@ static void __net_exit nf_tables_exit_net(struct net *net)
gc_seq = nft_gc_seq_begin(nft_net); gc_seq = nft_gc_seq_begin(nft_net);
if (!list_empty(&nft_net->commit_list) || WARN_ON_ONCE(!list_empty(&nft_net->commit_list));
!list_empty(&nft_net->module_list))
__nf_tables_abort(net, NFNL_ABORT_NONE); if (!list_empty(&nft_net->module_list))
nf_tables_module_autoload_cleanup(net);
__nft_release_tables(net); __nft_release_tables(net);