Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e778f56e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_{log,queue}: fix compilation without CONFIG_PROC_FS 



This patch fixes the following compilation error:

net/netfilter/nf_log.c:373:38: error: 'struct netns_nf' has no member named 'proc_netfilter'

if procfs is not set.

The netns support for nf_log, nfnetlink_log and nfnetlink_queue_core
requires CONFIG_PROC_FS in the removal path of their respective
/proc interface since net->nf.proc_netfilter is undefined in that
case.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Acked-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
parent efeaa555

net/netfilter/nf_log.c

+4 −1
Original line number Diff line number Diff line
@@ -368,17 +368,20 @@ static int __net_init nf_log_net_init(struct net *net) 
	return 0;



out_sysctl:

#ifdef CONFIG_PROC_FS

	/* For init_net: errors will trigger panic, don't unroll on error. */

	if (!net_eq(net, &init_net))

		remove_proc_entry("nf_log", net->nf.proc_netfilter);



#endif

	return ret;

}



static void __net_exit nf_log_net_exit(struct net *net)

{

	netfilter_log_sysctl_exit(net);

#ifdef CONFIG_PROC_FS

	remove_proc_entry("nf_log", net->nf.proc_netfilter);

#endif

}



static struct pernet_operations nf_log_net_ops = {

net/netfilter/nfnetlink_log.c

+2 −0
Original line number Diff line number Diff line
@@ -1045,7 +1045,9 @@ static int __net_init nfnl_log_net_init(struct net *net) 


static void __net_exit nfnl_log_net_exit(struct net *net)

{

#ifdef CONFIG_PROC_FS

	remove_proc_entry("nfnetlink_log", net->nf.proc_netfilter);

#endif

}



static struct pernet_operations nfnl_log_net_ops = {

net/netfilter/nfnetlink_queue_core.c

+2 −0
Original line number Diff line number Diff line
@@ -1285,7 +1285,9 @@ static int __net_init nfnl_queue_net_init(struct net *net) 


static void __net_exit nfnl_queue_net_exit(struct net *net)

{

#ifdef CONFIG_PROC_FS

	remove_proc_entry("nfnetlink_queue", net->nf.proc_netfilter);

#endif

}



static struct pernet_operations nfnl_queue_net_ops = {