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 /fs/reiserfs | |
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 'fs/reiserfs')
-rw-r--r-- | fs/reiserfs/procfs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c index d5066400638a..9229e5514a4e 100644 --- a/fs/reiserfs/procfs.c +++ b/fs/reiserfs/procfs.c | |||
@@ -492,7 +492,6 @@ int reiserfs_proc_info_init(struct super_block *sb) | |||
492 | spin_lock_init(&__PINFO(sb).lock); | 492 | spin_lock_init(&__PINFO(sb).lock); |
493 | REISERFS_SB(sb)->procdir = proc_mkdir(b, proc_info_root); | 493 | REISERFS_SB(sb)->procdir = proc_mkdir(b, proc_info_root); |
494 | if (REISERFS_SB(sb)->procdir) { | 494 | if (REISERFS_SB(sb)->procdir) { |
495 | REISERFS_SB(sb)->procdir->owner = THIS_MODULE; | ||
496 | REISERFS_SB(sb)->procdir->data = sb; | 495 | REISERFS_SB(sb)->procdir->data = sb; |
497 | add_file(sb, "version", show_version); | 496 | add_file(sb, "version", show_version); |
498 | add_file(sb, "super", show_super); | 497 | add_file(sb, "super", show_super); |
@@ -556,9 +555,7 @@ int reiserfs_proc_info_global_init(void) | |||
556 | { | 555 | { |
557 | if (proc_info_root == NULL) { | 556 | if (proc_info_root == NULL) { |
558 | proc_info_root = proc_mkdir(proc_info_root_name, NULL); | 557 | proc_info_root = proc_mkdir(proc_info_root_name, NULL); |
559 | if (proc_info_root) { | 558 | if (!proc_info_root) { |
560 | proc_info_root->owner = THIS_MODULE; | ||
561 | } else { | ||
562 | reiserfs_warning(NULL, "cannot create /proc/%s", | 559 | reiserfs_warning(NULL, "cannot create /proc/%s", |
563 | proc_info_root_name); | 560 | proc_info_root_name); |
564 | return 1; | 561 | return 1; |