android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()

Browse Source 
commit 24225011d81b471acc0e1e315b7d9905459a6304 upstream.

nft_unregister_flowtable_type() within nf_flow_inet_module_exit() can
concurrent with __nft_flowtable_type_get() within nf_tables_newflowtable().
And thhere is not any protection when iterate over nf_tables_flowtables
list in __nft_flowtable_type_get(). Therefore, there is pertential
data-race of nf_tables_flowtables list entry.

Use list_for_each_entry_rcu() to iterate over nf_tables_flowtables list
in __nft_flowtable_type_get(), and use rcu_read_lock() in the caller
nft_flowtable_type_get() to protect the entire type query process.

Fixes: 3b49e2e94e ("netfilter: nf_tables: add flow table netlink frontend")
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ziyang Xuan 2024-04-03 15:22:04 +08:00 committed by Greg Kroah-Hartman
parent 46c4481938
commit 940d41caa7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/netfilter/nf_tables_api.c
View File

@ -6879,11 +6879,12 @@ static int nft_flowtable_parse_hook(const struct nft_ctx *ctx,
return err; return err;
} }
/* call under rcu_read_lock */
static const struct nf_flowtable_type *__nft_flowtable_type_get(u8 family) static const struct nf_flowtable_type *__nft_flowtable_type_get(u8 family)
{ {
const struct nf_flowtable_type *type; const struct nf_flowtable_type *type;
list_for_each_entry(type, &nf_tables_flowtables, list) { list_for_each_entry_rcu(type, &nf_tables_flowtables, list) {
if (family == type->family) if (family == type->family)
return type; return type;
} }
@ -6895,9 +6896,13 @@ nft_flowtable_type_get(struct net *net, u8 family)
{ {
const struct nf_flowtable_type *type; const struct nf_flowtable_type *type;
rcu_read_lock();
type = __nft_flowtable_type_get(family); type = __nft_flowtable_type_get(family);
if (type != NULL && try_module_get(type->owner)) if (type != NULL && try_module_get(type->owner)) {
rcu_read_unlock();
return type; return type;
}
rcu_read_unlock();
lockdep_nfnl_nft_mutex_not_held(); lockdep_nfnl_nft_mutex_not_held();
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES