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

Commit 32292a7f authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Fix section mismatch warnings 



Fix section mismatch warnings caused by netfilter's init_or_cleanup
functions used in many places by splitting the init from the cleanup
parts.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 964ddaa1

net/ipv4/netfilter/ip_conntrack_standalone.c

+44 −46
Original line number Diff line number Diff line
@@ -776,18 +776,46 @@ static ctl_table ip_ct_net_table[] = { 
EXPORT_SYMBOL(ip_ct_log_invalid);

#endif /* CONFIG_SYSCTL */



static int init_or_cleanup(int init)

/* FIXME: Allow NULL functions and sub in pointers to generic for

   them. --RR */

int ip_conntrack_protocol_register(struct ip_conntrack_protocol *proto)

{

	int ret = 0;



	write_lock_bh(&ip_conntrack_lock);

	if (ip_ct_protos[proto->proto] != &ip_conntrack_generic_protocol) {

		ret = -EBUSY;

		goto out;

	}

	ip_ct_protos[proto->proto] = proto;

 out:

	write_unlock_bh(&ip_conntrack_lock);

	return ret;

}



void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto)

{

	write_lock_bh(&ip_conntrack_lock);

	ip_ct_protos[proto->proto] = &ip_conntrack_generic_protocol;

	write_unlock_bh(&ip_conntrack_lock);



	/* Somebody could be still looking at the proto in bh. */

	synchronize_net();



	/* Remove all contrack entries for this protocol */

	ip_ct_iterate_cleanup(kill_proto, &proto->proto);

}



static int __init ip_conntrack_standalone_init(void)

{

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *proc, *proc_exp, *proc_stat;

#endif

	int ret = 0;



	if (!init) goto cleanup;



	ret = ip_conntrack_init();

	if (ret < 0)

		goto cleanup_nothing;

		return ret;



#ifdef CONFIG_PROC_FS

	ret = -ENOMEM;
@@ -819,16 +847,12 @@ static int init_or_cleanup(int init) 
		goto cleanup_hooks;

	}

#endif



	return ret;



 cleanup:

	synchronize_net();

#ifdef CONFIG_SYSCTL

 	unregister_sysctl_table(ip_ct_sysctl_header);

 cleanup_hooks:

#endif

	nf_unregister_hooks(ip_conntrack_ops, ARRAY_SIZE(ip_conntrack_ops));

#endif

 cleanup_proc_stat:

#ifdef CONFIG_PROC_FS

	remove_proc_entry("ip_conntrack", proc_net_stat);
@@ -839,48 +863,22 @@ static int init_or_cleanup(int init) 
 cleanup_init:

#endif /* CONFIG_PROC_FS */

	ip_conntrack_cleanup();

 cleanup_nothing:

	return ret;

}



/* FIXME: Allow NULL functions and sub in pointers to generic for

   them. --RR */

int ip_conntrack_protocol_register(struct ip_conntrack_protocol *proto)

{

	int ret = 0;



	write_lock_bh(&ip_conntrack_lock);

	if (ip_ct_protos[proto->proto] != &ip_conntrack_generic_protocol) {

		ret = -EBUSY;

		goto out;

	}

	ip_ct_protos[proto->proto] = proto;

 out:

	write_unlock_bh(&ip_conntrack_lock);

	return ret;

}



void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto)

{

	write_lock_bh(&ip_conntrack_lock);

	ip_ct_protos[proto->proto] = &ip_conntrack_generic_protocol;

	write_unlock_bh(&ip_conntrack_lock);

	

	/* Somebody could be still looking at the proto in bh. */

	synchronize_net();



	/* Remove all contrack entries for this protocol */

	ip_ct_iterate_cleanup(kill_proto, &proto->proto);

}



static int __init ip_conntrack_standalone_init(void)

{

	return init_or_cleanup(1);

}



static void __exit ip_conntrack_standalone_fini(void)

{

	init_or_cleanup(0);

	synchronize_net();

#ifdef CONFIG_SYSCTL

	unregister_sysctl_table(ip_ct_sysctl_header);

#endif

	nf_unregister_hooks(ip_conntrack_ops, ARRAY_SIZE(ip_conntrack_ops));

#ifdef CONFIG_PROC_FS

	remove_proc_entry("ip_conntrack", proc_net_stat);

	proc_net_remove("ip_conntrack_expect");

	proc_net_remove("ip_conntrack");

#endif /* CONFIG_PROC_FS */

	ip_conntrack_cleanup();

}



module_init(ip_conntrack_standalone_init);

net/ipv4/netfilter/ip_nat_standalone.c

+7 −11
Original line number Diff line number Diff line
@@ -350,14 +350,12 @@ static struct nf_hook_ops ip_nat_ops[] = { 
	},

};



static int init_or_cleanup(int init)

static int __init ip_nat_standalone_init(void)

{

	int ret = 0;



	need_conntrack();



	if (!init) goto cleanup;



#ifdef CONFIG_XFRM

	BUG_ON(ip_nat_decode_session != NULL);

	ip_nat_decode_session = nat_decode_session;
@@ -374,8 +372,6 @@ static int init_or_cleanup(int init) 
	}

	return ret;



 cleanup:

	nf_unregister_hooks(ip_nat_ops, ARRAY_SIZE(ip_nat_ops));

 cleanup_rule_init:

	ip_nat_rule_cleanup();

 cleanup_decode_session:
@@ -386,14 +382,14 @@ static int init_or_cleanup(int init) 
	return ret;

}



static int __init ip_nat_standalone_init(void)

{

	return init_or_cleanup(1);

}



static void __exit ip_nat_standalone_fini(void)

{

	init_or_cleanup(0);

	nf_unregister_hooks(ip_nat_ops, ARRAY_SIZE(ip_nat_ops));

	ip_nat_rule_cleanup();

#ifdef CONFIG_XFRM

	ip_nat_decode_session = NULL;

	synchronize_net();

#endif

}



module_init(ip_nat_standalone_init);

net/ipv4/netfilter/ip_queue.c

+14 −17
Original line number Diff line number Diff line
@@ -662,15 +662,11 @@ static struct nf_queue_handler nfqh = { 
	.outfn	= &ipq_enqueue_packet,

};



static int

init_or_cleanup(int init)

static int __init ip_queue_init(void)

{

	int status = -ENOMEM;

	struct proc_dir_entry *proc;

	

	if (!init)

		goto cleanup;



	netlink_register_notifier(&ipq_nl_notifier);

	ipqnl = netlink_kernel_create(NETLINK_FIREWALL, 0, ipq_rcv_sk,

				      THIS_MODULE);
@@ -697,11 +693,6 @@ init_or_cleanup(int init) 
	}

	return status;



cleanup:

	nf_unregister_queue_handlers(&nfqh);

	synchronize_net();

	ipq_flush(NF_DROP);

	

cleanup_sysctl:

	unregister_sysctl_table(ipq_sysctl_header);

	unregister_netdevice_notifier(&ipq_dev_notifier);
@@ -717,15 +708,21 @@ cleanup_netlink_notifier: 
	return status;

}



static int __init ip_queue_init(void)

static void __exit ip_queue_fini(void)

{

	nf_unregister_queue_handlers(&nfqh);

	synchronize_net();

	ipq_flush(NF_DROP);



	return init_or_cleanup(1);

}

	unregister_sysctl_table(ipq_sysctl_header);

	unregister_netdevice_notifier(&ipq_dev_notifier);

	proc_net_remove(IPQ_PROC_FS_NAME);



static void __exit ip_queue_fini(void)

{

	init_or_cleanup(0);

	sock_release(ipqnl->sk_socket);

	mutex_lock(&ipqnl_mutex);

	mutex_unlock(&ipqnl_mutex);



	netlink_unregister_notifier(&ipq_nl_notifier);

}



MODULE_DESCRIPTION("IPv4 packet queue handler");

net/ipv4/netfilter/ipt_CLUSTERIP.c

+14 −26
Original line number Diff line number Diff line
@@ -725,22 +725,17 @@ static struct file_operations clusterip_proc_fops = { 


#endif /* CONFIG_PROC_FS */



static int init_or_cleanup(int fini)

static int __init ipt_clusterip_init(void)

{

	int ret;



	if (fini)

		goto cleanup;



	if (ipt_register_target(&clusterip_tgt)) {

		ret = -EINVAL;

		goto cleanup_none;

	}

	ret = ipt_register_target(&clusterip_tgt);

	if (ret < 0)

		return ret;



	if (nf_register_hook(&cip_arp_ops) < 0) {

		ret = -EINVAL;

	ret = nf_register_hook(&cip_arp_ops);

	if (ret < 0)

		goto cleanup_target;

	}



#ifdef CONFIG_PROC_FS

	clusterip_procdir = proc_mkdir("ipt_CLUSTERIP", proc_net);
@@ -753,31 +748,24 @@ static int init_or_cleanup(int fini) 


	printk(KERN_NOTICE "ClusterIP Version %s loaded successfully\n",

		CLUSTERIP_VERSION);



	return 0;



cleanup:

	printk(KERN_NOTICE "ClusterIP Version %s unloading\n",

		CLUSTERIP_VERSION);

#ifdef CONFIG_PROC_FS

	remove_proc_entry(clusterip_procdir->name, clusterip_procdir->parent);

#endif

cleanup_hook:

	nf_unregister_hook(&cip_arp_ops);

cleanup_target:

	ipt_unregister_target(&clusterip_tgt);

cleanup_none:

	return -EINVAL;

}



static int __init ipt_clusterip_init(void)

{

	return init_or_cleanup(0);

	return ret;

}



static void __exit ipt_clusterip_fini(void)

{

	init_or_cleanup(1);

	printk(KERN_NOTICE "ClusterIP Version %s unloading\n",

		CLUSTERIP_VERSION);

#ifdef CONFIG_PROC_FS

	remove_proc_entry(clusterip_procdir->name, clusterip_procdir->parent);

#endif

	nf_unregister_hook(&cip_arp_ops);

	ipt_unregister_target(&clusterip_tgt);

}



module_init(ipt_clusterip_init);

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+18 −18
Original line number Diff line number Diff line
@@ -432,16 +432,20 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = { 
extern struct nf_conntrack_protocol nf_conntrack_protocol_tcp4;

extern struct nf_conntrack_protocol nf_conntrack_protocol_udp4;

extern struct nf_conntrack_protocol nf_conntrack_protocol_icmp;

static int init_or_cleanup(int init)



MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));

MODULE_LICENSE("GPL");



static int __init nf_conntrack_l3proto_ipv4_init(void)

{

	int ret = 0;



	if (!init) goto cleanup;

	need_conntrack();



	ret = nf_register_sockopt(&so_getorigdst);

	if (ret < 0) {

		printk(KERN_ERR "Unable to register netfilter socket option\n");

		goto cleanup_nothing;

		return ret;

	}



	ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_tcp4);
@@ -484,13 +488,10 @@ static int init_or_cleanup(int init) 
#endif

	return ret;



 cleanup:

	synchronize_net();

#ifdef CONFIG_SYSCTL

 	unregister_sysctl_table(nf_ct_ipv4_sysctl_header);

 cleanup_hooks:

#endif

	nf_unregister_hooks(ipv4_conntrack_ops, ARRAY_SIZE(ipv4_conntrack_ops));

#endif

 cleanup_ipv4:

	nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);

 cleanup_icmp:
@@ -501,22 +502,21 @@ static int init_or_cleanup(int init) 
	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp4);

 cleanup_sockopt:

	nf_unregister_sockopt(&so_getorigdst);

 cleanup_nothing:

	return ret;

}



MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));

MODULE_LICENSE("GPL");



static int __init nf_conntrack_l3proto_ipv4_init(void)

{

	need_conntrack();

	return init_or_cleanup(1);

}



static void __exit nf_conntrack_l3proto_ipv4_fini(void)

{

	init_or_cleanup(0);

	synchronize_net();

#ifdef CONFIG_SYSCTL

 	unregister_sysctl_table(nf_ct_ipv4_sysctl_header);

#endif

	nf_unregister_hooks(ipv4_conntrack_ops, ARRAY_SIZE(ipv4_conntrack_ops));

	nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_icmp);

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_udp4);

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp4);

	nf_unregister_sockopt(&so_getorigdst);

}



module_init(nf_conntrack_l3proto_ipv4_init);