Commit e866cfa9 authored by Oleg Drokin's avatar Oleg Drokin Committed by Linus Torvalds

[PATCH] d_instantiate_unique / NFS inode leakage

If we have found aliased dentry that we return, inode reference is not
dropped and inode is not attached anywhere, so it seems the reference to
inode is leaked in that case.

Cc: Trond Myklebust <trond.myklebust@fys.uio.no>,
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 632d6407
...@@ -808,10 +808,14 @@ void d_instantiate(struct dentry *entry, struct inode * inode) ...@@ -808,10 +808,14 @@ void d_instantiate(struct dentry *entry, struct inode * inode)
* *
* Fill in inode information in the entry. On success, it returns NULL. * Fill in inode information in the entry. On success, it returns NULL.
* If an unhashed alias of "entry" already exists, then we return the * If an unhashed alias of "entry" already exists, then we return the
* aliased dentry instead. * aliased dentry instead and drop one reference to inode.
* *
* Note that in order to avoid conflicts with rename() etc, the caller * Note that in order to avoid conflicts with rename() etc, the caller
* had better be holding the parent directory semaphore. * had better be holding the parent directory semaphore.
*
* This also assumes that the inode count has been incremented
* (or otherwise set) by the caller to indicate that it is now
* in use by the dcache.
*/ */
struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode) struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode)
{ {
...@@ -838,6 +842,7 @@ struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode) ...@@ -838,6 +842,7 @@ struct dentry *d_instantiate_unique(struct dentry *entry, struct inode *inode)
dget_locked(alias); dget_locked(alias);
spin_unlock(&dcache_lock); spin_unlock(&dcache_lock);
BUG_ON(!d_unhashed(alias)); BUG_ON(!d_unhashed(alias));
iput(inode);
return alias; return alias;
} }
list_add(&entry->d_alias, &inode->i_dentry); list_add(&entry->d_alias, &inode->i_dentry);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment