proc:Add a reference of module when proc_reg_file opened
Subsystems (2)
Quoted 1 line
From
49b46362bf3221a259bfc73105ad041376b66878Mon Sep 17 00:00:00 2001
From: majianpeng <[email protected]>
Date: Sun, 26 Feb 2012 22:19:51 +0800
Subject: [PATCH] proc:Add a reference of module when proc_reg_file opened.
If struct file_operations of a regular file in procfs defined in module and defined .owner = THIS_MODULE,open this file must get a reference of module.
--- fs/proc/inode.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
fs/proc/inode.c +11 -2
@@ -317,6 +317,7 @@ static int proc_reg_open(struct inode *inode, struct file *file)int (*open)(struct inode *,struct file *);int (*release)(struct inode *,struct file *);struct pde_opener *pdeo; +const struct file_operations *fops;/* * What for, you ask? Well, we can have open, rmmod, remove_proc_entry
@@ -339,7 +340,12 @@ static int proc_reg_open(struct inode *inode, struct file *file)return -ENOENT ; } pde->pde_users++; - open = pde->proc_fops->open; +/* +*If proc_fops defined in module and used .owner = THIS_MODULE,so open must +*get a reference of module. +*/ + fops =fops_get (pde->proc_fops); + open = fops->open; release = pde->proc_fops->release;spin_unlock (&pde->pde_unload_lock);
@@ -354,8 +360,10 @@ static int proc_reg_open(struct inode *inode, struct file *file)/* Strictly for "too late" ->release in proc_reg_release(). */ pdeo->release = release;list_add (&pdeo->lh, &pde->pde_openers); - }else + }else { +fops_put (pde->proc_fops);kfree (pdeo); + }__pde_users_dec (pde);spin_unlock (&pde->pde_unload_lock);return rv;
@@ -402,6 +410,7 @@ static int proc_reg_release(struct inode *inode, struct file *file) } pde->pde_users++; release = pde->proc_fops->release; +fops_put (pde->proc_fops);if (pdeo) {list_del (&pdeo->lh);kfree (pdeo);
Signature · 6 lines
1.7.5.4 -------------- majianpeng 2012-02-26
Al Viro
maintainerQuoted 8 lines · majianpeng
Quoted 1 line
From
49b46362bf3221a259bfc73105ad041376b66878Mon Sep 17 00:00:00 2001From: majianpeng <[email protected]>
Date: Sun, 26 Feb 2012 22:19:51 +0800
Subject: [PATCH] proc:Add a reference of module whenproc_reg_fileopened.If struct
file_operationsof a regular file in procfs defined in module and defined .owner = THIS_MODULE,open this file must get a reference of module.
No. Read remove_proc_entry(), especially the part under ->pde_unload_lock. The whole damn point of that stuff is that opened file on procfs does *not* pin the module down; IO in progress does, but that's it.
You can't deadlock rmmod foobar </proc/crap/foobar; with your patch we'll be back to a pile of deadlocks in there.
IOW, NAK.