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

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

scsi: use non-racy method for proc entries creation 



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

Add correct ->owner to proc_fops to fix reading/module unloading race.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 16e70f64

drivers/scsi/scsi_proc.c

+2 −2
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ static int proc_scsi_open(struct inode *inode, struct file *file) 
}



static const struct file_operations proc_scsi_operations = {

	.owner		= THIS_MODULE,

	.open		= proc_scsi_open,

	.read		= seq_read,

	.write		= proc_scsi_write,
@@ -431,10 +432,9 @@ int __init scsi_init_procfs(void) 
	if (!proc_scsi)

		goto err1;



	pde = create_proc_entry("scsi/scsi", 0, NULL);

	pde = proc_create("scsi/scsi", 0, NULL, &proc_scsi_operations);

	if (!pde)

		goto err2;

	pde->proc_fops = &proc_scsi_operations;



	return 0;

drivers/scsi/sg.c

+4 −8
Original line number Diff line number Diff line
@@ -2667,7 +2667,6 @@ sg_proc_init(void) 
{

	int k, mask;

	int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);

	struct proc_dir_entry *pdep;

	struct sg_proc_leaf * leaf;



	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
@@ -2676,13 +2675,10 @@ sg_proc_init(void) 
	for (k = 0; k < num_leaves; ++k) {

		leaf = &sg_proc_leaf_arr[k];

		mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO;

		pdep = create_proc_entry(leaf->name, mask, sg_proc_sgp);

		if (pdep) {

			leaf->fops->owner = THIS_MODULE,

			leaf->fops->read = seq_read,

			leaf->fops->llseek = seq_lseek,

			pdep->proc_fops = leaf->fops;

		}

		leaf->fops->owner = THIS_MODULE;

		leaf->fops->read = seq_read;

		leaf->fops->llseek = seq_lseek;

		proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops);

	}

	return 0;

}