diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-03-25 15:48:06 -0400 |
---|---|---|
committer | Alexey Dobriyan <adobriyan@gmail.com> | 2009-03-30 17:14:44 -0400 |
commit | 99b76233803beab302123d243eea9e41149804f3 (patch) | |
tree | 398178210fe66845ccd6fa4258ba762a87e023ad /drivers/s390 | |
parent | 3dec7f59c370c7b58184d63293c3dc984d475840 (diff) |
proc 2/2: remove struct proc_dir_entry::owner
Setting ->owner as done currently (pde->owner = THIS_MODULE) is racy
as correctly noted at bug #12454. Someone can lookup entry with NULL
->owner, thus not pinning enything, and release it later resulting
in module refcount underflow.
We can keep ->owner and supply it at registration time like ->proc_fops
and ->data.
But this leaves ->owner as easy-manipulative field (just one C assignment)
and somebody will forget to unpin previous/pin current module when
switching ->owner. ->proc_fops is declared as "const" which should give
some thoughts.
->read_proc/->write_proc were just fixed to not require ->owner for
protection.
rmmod'ed directories will be empty and return "." and ".." -- no harm.
And directories with tricky enough readdir and lookup shouldn't be modular.
We definitely don't want such modular code.
Removing ->owner will also make PDE smaller.
So, let's nuke it.
Kudos to Jeff Layton for reminding about this, let's say, oversight.
http://bugzilla.kernel.org/show_bug.cgi?id=12454
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/block/dasd_proc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index 2080ba6a69b0..654daa3cdfda 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c | |||
@@ -320,7 +320,6 @@ dasd_proc_init(void) | |||
320 | dasd_proc_root_entry = proc_mkdir("dasd", NULL); | 320 | dasd_proc_root_entry = proc_mkdir("dasd", NULL); |
321 | if (!dasd_proc_root_entry) | 321 | if (!dasd_proc_root_entry) |
322 | goto out_nodasd; | 322 | goto out_nodasd; |
323 | dasd_proc_root_entry->owner = THIS_MODULE; | ||
324 | dasd_devices_entry = proc_create("devices", | 323 | dasd_devices_entry = proc_create("devices", |
325 | S_IFREG | S_IRUGO | S_IWUSR, | 324 | S_IFREG | S_IRUGO | S_IWUSR, |
326 | dasd_proc_root_entry, | 325 | dasd_proc_root_entry, |
@@ -334,7 +333,6 @@ dasd_proc_init(void) | |||
334 | goto out_nostatistics; | 333 | goto out_nostatistics; |
335 | dasd_statistics_entry->read_proc = dasd_statistics_read; | 334 | dasd_statistics_entry->read_proc = dasd_statistics_read; |
336 | dasd_statistics_entry->write_proc = dasd_statistics_write; | 335 | dasd_statistics_entry->write_proc = dasd_statistics_write; |
337 | dasd_statistics_entry->owner = THIS_MODULE; | ||
338 | return 0; | 336 | return 0; |
339 | 337 | ||
340 | out_nostatistics: | 338 | out_nostatistics: |