Return-Path: linux-nfs-owner@vger.kernel.org Received: from e23smtp03.au.ibm.com ([202.81.31.145]:45604 "EHLO e23smtp03.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932861Ab1JRPes (ORCPT ); Tue, 18 Oct 2011 11:34:48 -0400 From: "Aneesh Kumar K.V" To: agruen@kernel.org, bfields@fieldses.org, akpm@linux-foundation.org, viro@zeniv.linux.org.uk, dhowells@redhat.com Cc: aneesh.kumar@linux.vnet.ibm.com, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH -V7 12/26] vfs: Make acl_permission_check() work for richacls Date: Tue, 18 Oct 2011 21:02:47 +0530 Message-Id: <1318951981-5508-13-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1318951981-5508-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1318951981-5508-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andreas Gruenbacher Acked-by: David Howells Signed-off-by: Andreas Gruenbacher Signed-off-by: Aneesh Kumar K.V --- fs/namei.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index eb8f918..0c28f95 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -230,6 +230,20 @@ static int acl_permission_check(struct inode *inode, int mask) if (current_user_ns() != inode_userns(inode)) goto other_perms; + if (IS_RICHACL(inode)) { + int error = check_acl(inode, mask); + 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 (likely(current_fsuid() == inode->i_uid)) mode >>= 6; else { -- 1.7.5.4