netfilter: nfnetlink_log: wait for rcu grace period before freeing pernet state
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nfnetlink_log: wait for rcu grace period before freeing pernet state
sashiko reports: "nfnl_log_net_exit() calls nf_log_unset(), which clears the logger pointer without an RCU grace period. Immediately after, ops_free_list() frees the per-net state while concurrent packets might still be executing nf_log_packet() under rcu_read_lock()."
Clear the pointer via .pre_exit to make sure rcu readers have completed before pernet storage is free'd. The change in nf_log_syslog.c is only done for consistency: it doesn't use pernet data.
--- net/netfilter/nf_log_syslog.c | 4 ++-- net/netfilter/nfnetlink_log.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-)
net/netfilter/nf_log_syslog.c +2 -2
@@ -1014,7 +1014,7 @@ static int __net_init nf_log_syslog_net_init(struct net *net)return ret; } -static void __net_exit nf_log_syslog_net_exit(struct net *net) +static void __net_exit nf_log_syslog_net_pre_exit(struct net *net) {nf_log_unset (net, &nf_ip_logger);nf_log_unset (net, &nf_arp_logger);
@@ -1025,7 +1025,7 @@ static void __net_exit nf_log_syslog_net_exit(struct net *net)static struct pernet_operations nf_log_syslog_net_ops = { .init = nf_log_syslog_net_init, - .exit = nf_log_syslog_net_exit, + .pre_exit = nf_log_syslog_net_pre_exit, };static int __init nf_log_syslog_init (void )
net/netfilter/nfnetlink_log.c +9 -4
@@ -1170,21 +1170,26 @@ static int __net_init nfnl_log_net_init(struct net *net)return 0 ; } -static void __net_exit nfnl_log_net_exit(struct net *net) +static void __net_exit nfnl_log_net_pre_exit(struct net *net) { -struct nfnl_log_net *log =nfnl_log_pernet (net); -unsigned int i; -#ifdef CONFIG_PROC_FS remove_proc_entry ("nfnetlink_log" , net->nf.proc_netfilter);#endif nf_log_unset (net, &nfulnl_logger); +} + +static void __net_exit nfnl_log_net_exit(struct net *net) +{ +struct nfnl_log_net *log =nfnl_log_pernet (net); +unsigned int i; +for (i =0 ; i <INSTANCE_BUCKETS ; i++)WARN_ON_ONCE (!hlist_empty (&log->instance_table[i])); }static struct pernet_operations nfnl_log_net_ops = { .init = nfnl_log_net_init, + .pre_exit = nfnl_log_net_pre_exit, .exit = nfnl_log_net_exit, .id = &nfnl_log_net_id, .size =sizeof (struct nfnl_log_net ),
Signature · 1 line
2.54.0
Florian Westphal
maintainerQuoted 8 lines · Florian Westphal
sashiko reports: "
nfnl_log_net_exit()callsnf_log_unset(), which clears the logger pointer without an RCU grace period. Immediately after,ops_free_list()frees the per-net state while concurrent packets might still be executingnf_log_packet()underrcu_read_lock()."Clear the pointer via .pre_exit to make sure rcu readers have completed before pernet storage is free'd. The change in
nf_log_syslog.cis only done for consistency: it doesn't use pernet data.
Forgot to add:
The sashiko review can be ignored, its correct but there is a pending ebt_nflog patch that resolves the issue.