summaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-07-31 17:24:45 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2018-08-03 18:38:31 +0200
commit9e619d87b277bbcc4e0b64cc5963520c1cd99f18 (patch)
tree8a16221e78b6b8b4b50abd86eae58517ced1cf87 /net/netfilter
parentddba40be59c9be4059288464f8e6f38fbba27495 (diff)
downloadtalos-obmc-linux-9e619d87b277bbcc4e0b64cc5963520c1cd99f18.tar.gz
talos-obmc-linux-9e619d87b277bbcc4e0b64cc5963520c1cd99f18.zip
netfilter: nf_tables: flow event notifier must use transaction mutex
Fixes: f102d66b335a4 ("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>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_tables_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index f18085639807..06d6af067619 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5940,13 +5940,13 @@ static int nf_tables_flowtable_event(struct notifier_block *this,
if (!net)
return 0;
- nfnl_lock(NFNL_SUBSYS_NFTABLES);
+ mutex_lock(&net->nft.commit_mutex);
list_for_each_entry(table, &net->nft.tables, list) {
list_for_each_entry(flowtable, &table->flowtables, list) {
nft_flowtable_event(event, dev, flowtable);
}
}
- nfnl_unlock(NFNL_SUBSYS_NFTABLES);
+ mutex_unlock(&net->nft.commit_mutex);
put_net(net);
return NOTIFY_DONE;
}
OpenPOWER on IntegriCloud