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/media/video | |
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/media/video')
-rw-r--r-- | drivers/media/video/cpia.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index c3b0c8c63c76..43ab0adf3b61 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
@@ -1381,9 +1381,7 @@ static void proc_cpia_create(void) | |||
1381 | { | 1381 | { |
1382 | cpia_proc_root = proc_mkdir("cpia", NULL); | 1382 | cpia_proc_root = proc_mkdir("cpia", NULL); |
1383 | 1383 | ||
1384 | if (cpia_proc_root) | 1384 | if (!cpia_proc_root) |
1385 | cpia_proc_root->owner = THIS_MODULE; | ||
1386 | else | ||
1387 | LOG("Unable to initialise /proc/cpia\n"); | 1385 | LOG("Unable to initialise /proc/cpia\n"); |
1388 | } | 1386 | } |
1389 | 1387 | ||