Skip to content

Commit c3a6efd

Browse files
committed
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
jira VULN-4961 cve CVE-2024-27019 commit-author Ziyang Xuan <william.xuanziyang@huawei.com> commit d78d867 upstream-diff The cherry-pick tried to pull in extra cruft not part of the upstream patch. I have resolved the conflicts in favor of the 4.18.0-553.16.1 tagged code. nft_unregister_obj() can concurrent with __nft_obj_type_get(), and there is not any protection when iterate over nf_tables_objects list in __nft_obj_type_get(). Therefore, there is potential data-race of nf_tables_objects list entry. Use list_for_each_entry_rcu() to iterate over nf_tables_objects list in __nft_obj_type_get(), and use rcu_read_lock() in the caller nft_obj_type_get() to protect the entire type query process. Fixes: e500924 ("netfilter: nf_tables: add stateful objects") Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> (cherry picked from commit d78d867) Signed-off-by: Greg Rose <g.v.rose@ciq.com> Conflicts: net/netfilter/nf_tables_api.c
1 parent 62fbaa8 commit c3a6efd

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6137,7 +6137,7 @@ static const struct nft_object_type *__nft_obj_type_get(u32 objtype)
61376137
{
61386138
const struct nft_object_type *type;
61396139

6140-
list_for_each_entry(type, &nf_tables_objects, list) {
6140+
list_for_each_entry_rcu(type, &nf_tables_objects, list) {
61416141
if (objtype == type->type)
61426142
return type;
61436143
}
@@ -6149,9 +6149,13 @@ nft_obj_type_get(struct net *net, u32 objtype)
61496149
{
61506150
const struct nft_object_type *type;
61516151

6152+
rcu_read_lock();
61526153
type = __nft_obj_type_get(objtype);
6153-
if (type != NULL && try_module_get(type->owner))
6154+
if (type != NULL && try_module_get(type->owner)) {
6155+
rcu_read_unlock();
61546156
return type;
6157+
}
6158+
rcu_read_unlock();
61556159

61566160
lockdep_nfnl_nft_mutex_not_held();
61576161
#ifdef CONFIG_MODULES

0 commit comments

Comments
 (0)