diff options
| author | Florian Westphal <fw@strlen.de> | 2023-04-13 17:13:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-11 23:03:26 +0900 |
| commit | 6cf1d03a423fb7bff1c8542ac0b506b158936508 (patch) | |
| tree | 97279bcbdaf6ce433eaa3c5c3b5a0576d05cebeb /include | |
| parent | 551a26668c87d1710c7d1a5762d645f74c489133 (diff) | |
| download | linux-stable-6cf1d03a423fb7bff1c8542ac0b506b158936508.tar.gz linux-stable-6cf1d03a423fb7bff1c8542ac0b506b158936508.tar.bz2 linux-stable-6cf1d03a423fb7bff1c8542ac0b506b158936508.zip | |
netfilter: nf_tables: don't write table validation state without mutex
[ Upstream commit 9a32e9850686599ed194ccdceb6cd3dd56b2d9b9 ]
The ->cleanup callback needs to be removed, this doesn't work anymore as
the transaction mutex is already released in the ->abort function.
Just do it after a successful validation pass, this either happens
from commit or abort phases where transaction mutex is held.
Fixes: f102d66b335a ("netfilter: nf_tables: use dedicated mutex to guard transactions")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/nfnetlink.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h index 241e005f290a..e9a9ab34a7cc 100644 --- a/include/linux/netfilter/nfnetlink.h +++ b/include/linux/netfilter/nfnetlink.h @@ -45,7 +45,6 @@ struct nfnetlink_subsystem { int (*commit)(struct net *net, struct sk_buff *skb); int (*abort)(struct net *net, struct sk_buff *skb, enum nfnl_abort_action action); - void (*cleanup)(struct net *net); bool (*valid_genid)(struct net *net, u32 genid); }; |