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

Commit 8eeee8b1 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[NETFILTER]: Replate direct proc_fops assignment with proc_create call. 



This elliminates infamous race during module loading when one could lookup
proc entry without proc_fops assigned.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 920fc941

net/ipv4/netfilter/ip_queue.c

+3 −5
Original line number Diff line number Diff line
@@ -588,11 +588,9 @@ static int __init ip_queue_init(void) 
	}



#ifdef CONFIG_PROC_FS

	proc = create_proc_entry(IPQ_PROC_FS_NAME, 0, init_net.proc_net);

	if (proc) {

		proc->owner = THIS_MODULE;

		proc->proc_fops = &ip_queue_proc_fops;

	} else {

	proc = proc_create(IPQ_PROC_FS_NAME, 0, init_net.proc_net,

			   &ip_queue_proc_fops);

	if (!proc) {

		printk(KERN_ERR "ip_queue: failed to create proc entry\n");

		goto cleanup_ipqnl;

	}

net/ipv4/netfilter/ipt_CLUSTERIP.c

+2 −3
Original line number Diff line number Diff line
@@ -167,14 +167,13 @@ clusterip_config_init(struct ipt_clusterip_tgt_info *i, __be32 ip, 


		/* create proc dir entry */

		sprintf(buffer, "%u.%u.%u.%u", NIPQUAD(ip));

		c->pde = create_proc_entry(buffer, S_IWUSR|S_IRUSR,

					   clusterip_procdir);

		c->pde = proc_create(buffer, S_IWUSR|S_IRUSR,

				     clusterip_procdir, &clusterip_proc_fops);

		if (!c->pde) {

			kfree(c);

			return NULL;

		}

	}

	c->pde->proc_fops = &clusterip_proc_fops;

	c->pde->data = c;

#endif

net/ipv4/netfilter/ipt_recent.c

+1 −2
Original line number Diff line number Diff line
@@ -276,12 +276,11 @@ recent_mt_check(const char *tablename, const void *ip, 
	for (i = 0; i < ip_list_hash_size; i++)

		INIT_LIST_HEAD(&t->iphash[i]);

#ifdef CONFIG_PROC_FS

	t->proc = create_proc_entry(t->name, ip_list_perms, proc_dir);

	t->proc = proc_create(t->name, ip_list_perms, proc_dir, &recent_fops);

	if (t->proc == NULL) {

		kfree(t);

		goto out;

	}

	t->proc->proc_fops = &recent_fops;

	t->proc->uid       = ip_list_uid;

	t->proc->gid       = ip_list_gid;

	t->proc->data      = t;

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+2 −5
Original line number Diff line number Diff line
@@ -395,13 +395,10 @@ int __init nf_conntrack_ipv4_compat_init(void) 
	if (!proc_exp)

		goto err2;



	proc_stat = create_proc_entry("ip_conntrack", S_IRUGO, init_net.proc_net_stat);

	proc_stat = proc_create("ip_conntrack", S_IRUGO,

				init_net.proc_net_stat, &ct_cpu_seq_fops);

	if (!proc_stat)

		goto err3;



	proc_stat->proc_fops = &ct_cpu_seq_fops;

	proc_stat->owner = THIS_MODULE;



	return 0;



err3:

net/ipv6/netfilter/ip6_queue.c

+3 −5
Original line number Diff line number Diff line
@@ -591,11 +591,9 @@ static int __init ip6_queue_init(void) 
	}



#ifdef CONFIG_PROC_FS

	proc = create_proc_entry(IPQ_PROC_FS_NAME, 0, init_net.proc_net);

	if (proc) {

		proc->owner = THIS_MODULE;

		proc->proc_fops = &ip6_queue_proc_fops;

	} else {

	proc = proc_create(IPQ_PROC_FS_NAME, 0, init_net.proc_net,

			   &ip6_queue_proc_fops);

	if (!proc) {

		printk(KERN_ERR "ip6_queue: failed to create proc entry\n");

		goto cleanup_ipqnl;

	}