fix inode leaks on d_splice_alias() failure exits
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 23 Oct 2014 17:26:21 +0000 (13:26 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 24 Oct 2014 02:30:18 +0000 (22:30 -0400)
d_splice_alias() callers expect it to either stash the inode reference
into a new alias, or drop the inode reference.  That makes it possible
to just return d_splice_alias() result from ->lookup() instance, without
any extra housekeeping required.

Unfortunately, that should include the failure exits.  If d_splice_alias()
returns an error, it leaves the dentry it has been given negative and
thus it *must* drop the inode reference.  Easily fixed, but it goes way
back and will need backporting.

Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/dcache.c

index d5a23fd0da903848682c659085a6c560e48d8a8c..3ffef7f4e5cdd9d00ca454130070f4619a8707d6 100644 (file)
@@ -2673,11 +2673,13 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
                        if (!IS_ROOT(new)) {
                                spin_unlock(&inode->i_lock);
                                dput(new);
+                               iput(inode);
                                return ERR_PTR(-EIO);
                        }
                        if (d_ancestor(new, dentry)) {
                                spin_unlock(&inode->i_lock);
                                dput(new);
+                               iput(inode);
                                return ERR_PTR(-EIO);
                        }
                        write_seqlock(&rename_lock);