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

Commit a95609cb authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Linus Torvalds
Browse files

netdev: use non-racy method for proc entries creation 



Use proc_create()/proc_create_data() to make sure that ->proc_fops and ->data
be setup before gluing PDE to main tree.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf7acfab

drivers/net/bonding/bond_main.c

+3 −6
Original line number Diff line number Diff line
@@ -3282,17 +3282,14 @@ static int bond_create_proc_entry(struct bonding *bond) 
	struct net_device *bond_dev = bond->dev;



	if (bond_proc_dir) {

		bond->proc_entry = create_proc_entry(bond_dev->name,

						     S_IRUGO,

						     bond_proc_dir);

		bond->proc_entry = proc_create_data(bond_dev->name,

						    S_IRUGO, bond_proc_dir,

						    &bond_info_fops, bond);

		if (bond->proc_entry == NULL) {

			printk(KERN_WARNING DRV_NAME

			       ": Warning: Cannot create /proc/net/%s/%s\n",

			       DRV_NAME, bond_dev->name);

		} else {

			bond->proc_entry->data = bond;

			bond->proc_entry->proc_fops = &bond_info_fops;

			bond->proc_entry->owner = THIS_MODULE;

			memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);

		}

	}

drivers/net/ibmveth.c

+3 −6
Original line number Diff line number Diff line
@@ -1302,13 +1302,10 @@ static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter) 
	if (ibmveth_proc_dir) {

		char u_addr[10];

		sprintf(u_addr, "%x", adapter->vdev->unit_address);

		entry = create_proc_entry(u_addr, S_IFREG, ibmveth_proc_dir);

		if (!entry) {

		entry = proc_create_data(u_addr, S_IFREG, ibmveth_proc_dir,

					 &ibmveth_proc_fops, adapter);

		if (!entry)

			ibmveth_error_printk("Cannot create adapter proc entry");

		} else {

			entry->data = (void *) adapter;

			entry->proc_fops = &ibmveth_proc_fops;

		}

	}

	return;

}

drivers/net/irda/vlsi_ir.c

+2 −3
Original line number Diff line number Diff line
@@ -1674,13 +1674,12 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (vlsi_proc_root != NULL) {

		struct proc_dir_entry *ent;



		ent = create_proc_entry(ndev->name, S_IFREG|S_IRUGO, vlsi_proc_root);

		ent = proc_create_data(ndev->name, S_IFREG|S_IRUGO,

				       vlsi_proc_root, VLSI_PROC_FOPS, ndev);

		if (!ent) {

			IRDA_WARNING("%s: failed to create proc entry\n",

				     __FUNCTION__);

		} else {

			ent->data = ndev;

			ent->proc_fops = VLSI_PROC_FOPS;

			ent->size = 0;

		}

		idev->proc_entry = ent;

drivers/net/pppoe.c

+1 −3
Original line number Diff line number Diff line
@@ -1052,11 +1052,9 @@ static int __init pppoe_proc_init(void) 
{

	struct proc_dir_entry *p;



	p = create_proc_entry("pppoe", S_IRUGO, init_net.proc_net);

	p = proc_net_fops_create(&init_net, "pppoe", S_IRUGO, &pppoe_seq_fops);

	if (!p)

		return -ENOMEM;



	p->proc_fops = &pppoe_seq_fops;

	return 0;

}

#else /* CONFIG_PROC_FS */

drivers/net/pppol2tp.c

+2 −2
Original line number Diff line number Diff line
@@ -2469,12 +2469,12 @@ static int __init pppol2tp_init(void) 
		goto out_unregister_pppol2tp_proto;



#ifdef CONFIG_PROC_FS

	pppol2tp_proc = create_proc_entry("pppol2tp", 0, init_net.proc_net);

	pppol2tp_proc = proc_net_fops_create(&init_net, "pppol2tp", 0,

					     &pppol2tp_proc_fops);

	if (!pppol2tp_proc) {

		err = -ENOMEM;

		goto out_unregister_pppox_proto;

	}

	pppol2tp_proc->proc_fops = &pppol2tp_proc_fops;

#endif /* CONFIG_PROC_FS */

	printk(KERN_INFO "PPPoL2TP kernel driver, %s\n",

	       PPPOL2TP_DRV_VERSION);