[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1298469131-16555-12-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
Date: Wed, 23 Feb 2011 19:21:58 +0530
From: "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>
To: sfrench@...ibm.com, agruen@...bit.com, dilger.kernel@...ger.ca,
sandeen@...hat.com, tytso@....edu, bfields@...ldses.org,
jlayton@...hat.com
Cc: aneesh.kumar@...ux.vnet.ibm.com, linux-fsdevel@...r.kernel.org,
linux-nfs@...r.kernel.org, linux-ext4@...r.kernel.org,
linux-kernel@...r.kernel.org, Andreas Gruenbacher <agruen@...e.de>
Subject: [PATCH -V5 11/24] vfs: Make acl_permission_check() work for richacls
From: Andreas Gruenbacher <agruen@...e.de>
Signed-off-by: Andreas Gruenbacher <agruen@...e.de>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@...ux.vnet.ibm.com>
---
fs/namei.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 1b6dbc9..d7ff419 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -174,6 +174,20 @@ static int acl_permission_check(struct inode *inode, int mask, unsigned int flag
{
umode_t mode = inode->i_mode;
+ if (IS_RICHACL(inode)) {
+ int error = check_acl(inode, mask, flags);
+ if (error != -EAGAIN)
+ return error;
+ if (mask & (MAY_DELETE_SELF | MAY_TAKE_OWNERSHIP |
+ MAY_CHMOD | MAY_SET_TIMES)) {
+ /*
+ * The file permission bit cannot grant these
+ * permissions.
+ */
+ return -EACCES;
+ }
+ }
+
if (current_fsuid() == inode->i_uid)
mode >>= 6;
else {
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists