Unionfs: lock_rename related locking fixes

CC: Mike Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 05867f4beaaab20ffcf1bfe483f245431e1a6d17..19c8fe7135c502866cedfd8ae33330306fa0830d 100644 (file)
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -77,6 +77,7 @@ static int __unionfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        struct dentry *lower_new_dentry;
        struct dentry *lower_old_dir_dentry;
        struct dentry *lower_new_dir_dentry;
+       struct dentry *trap;
 
        lower_new_dentry = unionfs_lower_dentry_idx(new_dentry, bindex);
        lower_old_dentry = unionfs_lower_dentry_idx(old_dentry, bindex);
@@ -104,20 +105,34 @@ static int __unionfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                goto out;
 
        dget(lower_old_dentry);
+       dget(lower_new_dentry);
        lower_old_dir_dentry = dget_parent(lower_old_dentry);
        lower_new_dir_dentry = dget_parent(lower_new_dentry);
 
        /* see Documentation/filesystems/unionfs/issues.txt */
        lockdep_off();
-       lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
+       trap = lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
+       /* source should not be ancenstor of target */
+       if (trap == lower_old_dentry) {
+               err = -EINVAL;
+               goto out_err_unlock;
+       }
+       /* target should not be ancenstor of source */
+       if (trap == lower_new_dentry) {
+               err = -ENOTEMPTY;
+               goto out_err_unlock;
+       }
        err = vfs_rename(lower_old_dir_dentry->d_inode, lower_old_dentry,
                         lower_new_dir_dentry->d_inode, lower_new_dentry);
+
+out_err_unlock:
        unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
        lockdep_on();
 
        dput(lower_old_dir_dentry);
        dput(lower_new_dir_dentry);
        dput(lower_old_dentry);
+       dput(lower_new_dentry);
 
 out:
        if (!err) {