netfilter: nf_tables: Use rcu lock to enhance protection of the lists
Subsystems (2)
cover netfilter: nf_tables: Use rcu lock to enhance protection of the lists
nf_tables_expressions and nf_tables_objects lists can be concurrent between type lookup and module unloading process. But there is not any protection in type lookup process. Therefore, there is pertential data-race of the lists entry.
Use rcu lock to enhance protection of the lists.
Ziyang Xuan (2):
netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
net/netfilter/nf_tables_api.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
nft_unregister_expr() can concurrent with __nft_expr_type_get(), and there is not any protection when iterate over nf_tables_expressions list in __nft_expr_type_get(). Therefore, there is pertential data-race of nf_tables_expressions list entry.
Use list_for_each_entry_rcu() to iterate over nf_tables_expressions list in __nft_expr_type_get(), and use rcu_read_lock() in the caller nft_expr_type_get() to protect the entire type query process.
--- net/netfilter/nf_tables_api.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +6 -2
@@ -3056,7 +3056,7 @@ static const struct nft_expr_type *__nft_expr_type_get(u8 family, {const struct nft_expr_type *type, *candidate =NULL ; -list_for_each_entry (type, &nf_tables_expressions, list) { +list_for_each_entry_rcu (type, &nf_tables_expressions, list) {if (!nla_strcmp (nla, type->name)) {if (!type->family && !candidate) candidate = type;
@@ -3088,9 +3088,13 @@ static const struct nft_expr_type *nft_expr_type_get(struct net *net,if (nla ==NULL )return ERR_PTR (-EINVAL ); +rcu_read_lock (); type =__nft_expr_type_get (family, nla); -if (type !=NULL &&try_module_get (type->owner)) +if (type !=NULL &&try_module_get (type->owner)) { +rcu_read_unlock ();return type; + } +rcu_read_unlock ();lockdep_nfnl_nft_mutex_not_held ();#ifdef CONFIG_MODULES
Signature · 1 line
2.25.1
Re: [PATCH nft 1/2] netfilter: nf_tables: Fix potential data-race in __nft_expr_type_get()
Quoted 8 lines · Ziyang Xuan
nft_unregister_expr()can concurrent with__nft_expr_type_get(), and there is not any protection when iterate overnf_tables_expressionslist in__nft_expr_type_get(). Therefore, there is pertential data-race ofnf_tables_expressionslist entry.Use
list_for_each_entry_rcu()to iterate overnf_tables_expressionslist in__nft_expr_type_get(), and usercu_read_lock()in the callernft_expr_type_get()to protect the entire type query process.
Applied to nf, thanks
PATCH 2/2 netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
In reply to Ziyang Xuannft_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 pertential 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.
--- net/netfilter/nf_tables_api.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +6 -2
@@ -7607,7 +7607,7 @@ static const struct nft_object_type *__nft_obj_type_get(u32 objtype, u8 family) {const struct nft_object_type *type; -list_for_each_entry (type, &nf_tables_objects, list) { +list_for_each_entry_rcu (type, &nf_tables_objects, list) {if (type->family !=NFPROTO_UNSPEC && type->family != family)continue ;
@@ -7623,9 +7623,13 @@ nft_obj_type_get(struct net *net, u32 objtype, u8 family) {const struct nft_object_type *type; +rcu_read_lock (); type =__nft_obj_type_get (objtype, family); -if (type !=NULL &&try_module_get (type->owner)) +if (type !=NULL &&try_module_get (type->owner)) { +rcu_read_unlock ();return type; + } +rcu_read_unlock ();lockdep_nfnl_nft_mutex_not_held ();#ifdef CONFIG_MODULES
Signature · 1 line
2.25.1
Pablo Neira Ayuso
maintainerRe: [PATCH nft 2/2] netfilter: nf_tables: Fix potential data-race in __nft_obj_type_get()
Quoted 8 lines · Ziyang Xuan
nft_unregister_obj()can concurrent with__nft_obj_type_get(), and there is not any protection when iterate overnf_tables_objectslist in__nft_obj_type_get(). Therefore, there is pertential data-race ofnf_tables_objectslist entry.Use
list_for_each_entry_rcu()to iterate overnf_tables_objectslist in__nft_obj_type_get(), and usercu_read_lock()in the callernft_obj_type_get()to protect the entire type query process.
Also applied, thanks
Quoted 37 lines
Fixes e50092404c1b ("netfilter: nf_tables: add stateful objects")Signed-off-by Ziyang Xuan <[email protected]>--- net/netfilter/nf_tables_api.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)net/netfilter/nf_tables_api.c +6
-2@@ -7607,7 +7607,7 @@ static const struct nft_object_type *__nft_obj_type_get(u32 objtype, u8 family) {const struct nft_object_type *type; -list_for_each_entry (type, &nf_tables_objects, list) { +list_for_each_entry_rcu (type, &nf_tables_objects, list) {if (type->family !=NFPROTO_UNSPEC && type->family != family)continue ;@@ -7623,9 +7623,13 @@ nft_obj_type_get(struct net *net, u32 objtype, u8 family) {const struct nft_object_type *type; +rcu_read_lock (); type =__nft_obj_type_get (objtype, family); -if (type !=NULL &&try_module_get (type->owner)) +if (type !=NULL &&try_module_get (type->owner)) { +rcu_read_unlock ();return type; + } +rcu_read_unlock ();lockdep_nfnl_nft_mutex_not_held ();#ifdef CONFIG_MODULES Signature · 1 line
2.25.1