--- fs/namei.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 68aa8ab..5f6dcd4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3019,16 +3019,18 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, { struct dentry *new_dentry; struct nameidata nd; + struct nameidata old_nd; struct path old_path; int error; char *to; + char *from; if ((flags & ~AT_SYMLINK_FOLLOW) != 0) return -EINVAL; - error = user_path_at(olddfd, oldname, + error = user_path_nd(olddfd, oldname, flags & AT_SYMLINK_FOLLOW ? LOOKUP_FOLLOW : 0, - &old_path); + &old_nd, &old_path, &from); if (error) return error; @@ -3036,8 +3038,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, if (error) goto out; error = -EXDEV; - if (old_path.mnt != nd.path.mnt) - goto out_release; + if (old_path.mnt != nd.path.mnt) { + if (IS_UNIONED_DIR(&old_nd.path) && + (old_nd.path.mnt == nd.path.mnt)) { + error = mnt_want_write(old_nd.path.mnt); + if (error) + goto out_release; + error = union_copyup(&old_nd, &old_path); + mnt_drop_write(old_nd.path.mnt); + if (error) + goto out_release; + } else { + goto out_release; + } + } new_dentry = lookup_create(&nd, 0); error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) @@ -3060,6 +3074,8 @@ out_release: putname(to); out: path_put(&old_path); + path_put(&old_nd.path); + putname(from); return error; } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html