Browse Source

dcache: d_splice_alias should detect loops

I believe this can only happen in the case of a corrupted filesystem.
So -EIO looks like the appropriate error.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
J. Bruce Fields 11 years ago
parent
commit
95ad5c2913
1 changed files with 5 additions and 0 deletions
  1. 5 0
      fs/dcache.c

+ 5 - 0
fs/dcache.c

@@ -2706,6 +2706,11 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
 				dput(new);
 				dput(new);
 				return ERR_PTR(-EIO);
 				return ERR_PTR(-EIO);
 			}
 			}
+			if (d_ancestor(new, dentry)) {
+				spin_unlock(&inode->i_lock);
+				dput(new);
+				return ERR_PTR(-EIO);
+			}
 			write_seqlock(&rename_lock);
 			write_seqlock(&rename_lock);
 			__d_materialise_dentry(dentry, new);
 			__d_materialise_dentry(dentry, new);
 			write_sequnlock(&rename_lock);
 			write_sequnlock(&rename_lock);