diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-23 13:26:21 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-23 22:30:18 -0400 |
commit | 51486b900ee92856b977eacfc5bfbe6565028070 (patch) | |
tree | 7212a9d040a00c87bf8480d6ad4195658c4eca52 /fs/dcache.c | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
fix inode leaks on d_splice_alias() failure exits
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>
Diffstat (limited to 'fs/dcache.c')
-rw-r--r-- | fs/dcache.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index d5a23fd0da90..3ffef7f4e5cd 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -2673,11 +2673,13 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) | |||
2673 | if (!IS_ROOT(new)) { | 2673 | if (!IS_ROOT(new)) { |
2674 | spin_unlock(&inode->i_lock); | 2674 | spin_unlock(&inode->i_lock); |
2675 | dput(new); | 2675 | dput(new); |
2676 | iput(inode); | ||
2676 | return ERR_PTR(-EIO); | 2677 | return ERR_PTR(-EIO); |
2677 | } | 2678 | } |
2678 | if (d_ancestor(new, dentry)) { | 2679 | if (d_ancestor(new, dentry)) { |
2679 | spin_unlock(&inode->i_lock); | 2680 | spin_unlock(&inode->i_lock); |
2680 | dput(new); | 2681 | dput(new); |
2682 | iput(inode); | ||
2681 | return ERR_PTR(-EIO); | 2683 | return ERR_PTR(-EIO); |
2682 | } | 2684 | } |
2683 | write_seqlock(&rename_lock); | 2685 | write_seqlock(&rename_lock); |