[PATCH] sunrpc: cache_register can use wrong module reference

When registering an RPC cache, cache_register() always sets the owner as the
sunrpc module.  However, there are RPC caches owned by other modules.  With
the incorrect owner setting, the real owning module can be removed potentially
with an open reference to the cache from userspace.

For example, if one were to stop the nfs server and unmount the nfsd
filesystem, the nfsd module could be removed eventhough rpc.idmapd had
references to the idtoname and nametoid caches (i.e.
/proc/net/rpc/nfs4.<cachename>/channel is still open).  This resulted in a
system panic on one of our machines when attempting to restart the nfs
services after reloading the nfsd module.

The following patch adds a 'struct module *owner' field in struct
cache_detail.  The owner is further assigned to the struct proc_dir_entry
in cache_register() so that the module cannot be unloaded while user-space
daemons have an open reference on the associated file under /proc.

Signed-off-by: Bruce Allan <bwa@us.ibm.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 900f5bc7e336..f509e9992767 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -177,7 +177,7 @@ void cache_register(struct cache_detail *cd)
         cd->proc_ent = proc_mkdir(cd->name, proc_net_rpc);
         if (cd->proc_ent) {
                 struct proc_dir_entry *p;
-                cd->proc_ent->owner = THIS_MODULE;
+                cd->proc_ent->owner = cd->owner;
                 cd->channel_ent = cd->content_ent = NULL;
                 
                 p = create_proc_entry("flush", S_IFREG|S_IRUSR|S_IWUSR,
@@ -185,7 +185,7 @@ void cache_register(struct cache_detail *cd)
                 cd->flush_ent =  p;
                 if (p) {
                         p->proc_fops = &cache_flush_operations;
-                        p->owner = THIS_MODULE;
+                        p->owner = cd->owner;
                         p->data = cd;
                 }
  
@@ -195,7 +195,7 @@ void cache_register(struct cache_detail *cd)
                         cd->channel_ent = p;
                         if (p) {
                                 p->proc_fops = &cache_file_operations;
-                                p->owner = THIS_MODULE;
+                                p->owner = cd->owner;
                                 p->data = cd;
                         }
                 }
@@ -205,7 +205,7 @@ void cache_register(struct cache_detail *cd)
                         cd->content_ent = p;
                         if (p) {
                                 p->proc_fops = &content_file_operations;
-                                p->owner = THIS_MODULE;
+                                p->owner = cd->owner;
                                 p->data = cd;
                         }
                 }