Prev: [PATCH 38/39] union-mount: Implement union-aware setxattr()
Next: [PATCH 30/39] union-mount: Implement union-aware link()
From: Valerie Aurora on 8 Aug 2010 12:00 Signed-off-by: Valerie Aurora <vaurora(a)redhat.com> --- fs/open.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/fs/open.c b/fs/open.c index fc56da0..8588b31 100644 --- a/fs/open.c +++ b/fs/open.c @@ -552,18 +552,35 @@ static int chown_common(struct path *path, uid_t user, gid_t group) SYSCALL_DEFINE3(chown, const char __user *, filename, uid_t, user, gid_t, group) { struct path path; + struct nameidata nd; + struct vfsmount *mnt; + char *tmp; int error; - error = user_path(filename, &path); + error = user_path_nd(AT_FDCWD, filename, LOOKUP_FOLLOW, + &nd, &path, &tmp); if (error) goto out; - error = mnt_want_write(path.mnt); + + if (IS_DIR_UNIONED(nd.path.dentry)) + mnt = nd.path.mnt; + else + mnt = path.mnt; + + error = mnt_want_write(mnt); if (error) goto out_release; + + error = union_copyup(&nd, &path); + if (error) + goto out_drop_write; error = chown_common(&path, user, group); - mnt_drop_write(path.mnt); +out_drop_write: + mnt_drop_write(mnt); out_release: path_put(&path); + path_put(&nd.path); + putname(tmp); out: return error; } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |