Răsfoiți Sursa

netfilter: Add missing CONFIG_SYSCTL checks in ipv6's nf_conntrack_reasm.c

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 14 ani în urmă
părinte
comite
7932c2e55c
1 a modificat fișierele cu 4 adăugiri și 1 ștergeri
  1. 4 1
      net/ipv6/netfilter/nf_conntrack_reasm.c

+ 4 - 1
net/ipv6/netfilter/nf_conntrack_reasm.c

@@ -625,21 +625,24 @@ int nf_ct_frag6_init(void)
 	inet_frags_init_net(&nf_init_frags);
 	inet_frags_init_net(&nf_init_frags);
 	inet_frags_init(&nf_frags);
 	inet_frags_init(&nf_frags);
 
 
+#ifdef CONFIG_SYSCTL
 	nf_ct_frag6_sysctl_header = register_sysctl_paths(nf_net_netfilter_sysctl_path,
 	nf_ct_frag6_sysctl_header = register_sysctl_paths(nf_net_netfilter_sysctl_path,
 							  nf_ct_frag6_sysctl_table);
 							  nf_ct_frag6_sysctl_table);
 	if (!nf_ct_frag6_sysctl_header) {
 	if (!nf_ct_frag6_sysctl_header) {
 		inet_frags_fini(&nf_frags);
 		inet_frags_fini(&nf_frags);
 		return -ENOMEM;
 		return -ENOMEM;
 	}
 	}
+#endif
 
 
 	return 0;
 	return 0;
 }
 }
 
 
 void nf_ct_frag6_cleanup(void)
 void nf_ct_frag6_cleanup(void)
 {
 {
+#ifdef CONFIG_SYSCTL
 	unregister_sysctl_table(nf_ct_frag6_sysctl_header);
 	unregister_sysctl_table(nf_ct_frag6_sysctl_header);
 	nf_ct_frag6_sysctl_header = NULL;
 	nf_ct_frag6_sysctl_header = NULL;
-
+#endif
 	inet_frags_fini(&nf_frags);
 	inet_frags_fini(&nf_frags);
 
 
 	nf_init_frags.low_thresh = 0;
 	nf_init_frags.low_thresh = 0;