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 /arch/ia64/sn | |
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 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/sn2/prominfo_proc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/sn/kernel/sn2/prominfo_proc.c b/arch/ia64/sn/kernel/sn2/prominfo_proc.c index 4dcce3d0e04c..e63328818643 100644 --- a/arch/ia64/sn/kernel/sn2/prominfo_proc.c +++ b/arch/ia64/sn/kernel/sn2/prominfo_proc.c | |||
@@ -225,7 +225,6 @@ static struct proc_dir_entry *sgi_prominfo_entry; | |||
225 | int __init prominfo_init(void) | 225 | int __init prominfo_init(void) |
226 | { | 226 | { |
227 | struct proc_dir_entry **entp; | 227 | struct proc_dir_entry **entp; |
228 | struct proc_dir_entry *p; | ||
229 | cnodeid_t cnodeid; | 228 | cnodeid_t cnodeid; |
230 | unsigned long nasid; | 229 | unsigned long nasid; |
231 | int size; | 230 | int size; |
@@ -246,14 +245,10 @@ int __init prominfo_init(void) | |||
246 | sprintf(name, "node%d", cnodeid); | 245 | sprintf(name, "node%d", cnodeid); |
247 | *entp = proc_mkdir(name, sgi_prominfo_entry); | 246 | *entp = proc_mkdir(name, sgi_prominfo_entry); |
248 | nasid = cnodeid_to_nasid(cnodeid); | 247 | nasid = cnodeid_to_nasid(cnodeid); |
249 | p = create_proc_read_entry("fit", 0, *entp, read_fit_entry, | 248 | create_proc_read_entry("fit", 0, *entp, read_fit_entry, |
250 | (void *)nasid); | 249 | (void *)nasid); |
251 | if (p) | 250 | create_proc_read_entry("version", 0, *entp, |
252 | p->owner = THIS_MODULE; | ||
253 | p = create_proc_read_entry("version", 0, *entp, | ||
254 | read_version_entry, (void *)nasid); | 251 | read_version_entry, (void *)nasid); |
255 | if (p) | ||
256 | p->owner = THIS_MODULE; | ||
257 | entp++; | 252 | entp++; |
258 | } | 253 | } |
259 | 254 | ||