[PATCH 69/76] union-mount: Implement union-aware lchown()
From: David Howells <dhowells@redhat.com>
Date: 2011-06-17 16:10:30
Subsystem:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
From: Valerie Aurora <redacted> --- fs/open.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/fs/open.c b/fs/open.c
index 1ce2da3..8dca771 100644
--- a/fs/open.c
+++ b/fs/open.c@@ -661,18 +661,35 @@ out: SYSCALL_DEFINE3(lchown, 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_lpath(filename, &path); + error = user_path_nd(AT_FDCWD, filename, 0, &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; }