From mboxrd@z Thu Jan 1 00:00:00 1970 From: Valerie Aurora Subject: [PATCH 70/74] union-mount: Implement union-aware chmod()/fchmodat() Date: Tue, 22 Mar 2011 19:05:01 -0700 Message-ID: <1300845905-14433-27-git-send-email-valerie.aurora@gmail.com> References: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com> Cc: viro@zeniv.linux.org.uk, Valerie Aurora , Valerie Aurora To: linux-fsdevel@vger.kernel.org, linux@vger.kernel.org Return-path: Received: from mail-yw0-f46.google.com ([209.85.213.46]:57068 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755289Ab1CWCGY (ORCPT ); Tue, 22 Mar 2011 22:06:24 -0400 In-Reply-To: <1300845905-14433-1-git-send-email-valerie.aurora@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Valerie Aurora Signed-off-by: Valerie Aurora --- fs/open.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/fs/open.c b/fs/open.c index 23f4b75..4f17626 100644 --- a/fs/open.c +++ b/fs/open.c @@ -503,18 +503,32 @@ out: SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode) { struct path path; + struct nameidata nd; + struct vfsmount *mnt; struct inode *inode; + char *tmp; int error; struct iattr newattrs; - error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path); + error = user_path_nd(dfd, filename, LOOKUP_FOLLOW, &nd, + &path, &tmp); if (error) goto out; - inode = path.dentry->d_inode; - 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 dput_and_out; + + error = union_copyup(&nd, &path); + if (error) + goto mnt_drop_write_and_out; + + inode = path.dentry->d_inode; mutex_lock(&inode->i_mutex); error = security_path_chmod(path.dentry, path.mnt, mode); if (error) @@ -526,9 +540,12 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode) error = notify_change(path.dentry, &newattrs); out_unlock: mutex_unlock(&inode->i_mutex); - mnt_drop_write(path.mnt); +mnt_drop_write_and_out: + mnt_drop_write(mnt); dput_and_out: path_put(&path); + path_put(&nd.path); + putname(tmp); out: return error; } -- 1.7.0.4