From patchwork Wed Feb 23 13:51:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 584781 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1NDxAYf027877 for ; Wed, 23 Feb 2011 13:59:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932106Ab1BWNxe (ORCPT ); Wed, 23 Feb 2011 08:53:34 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:33597 "EHLO e28smtp08.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755530Ab1BWNxc (ORCPT ); Wed, 23 Feb 2011 08:53:32 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp08.in.ibm.com (8.14.4/8.13.1) with ESMTP id p1NCuoGx008115; Wed, 23 Feb 2011 18:26:50 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1NDrTBD4288706; Wed, 23 Feb 2011 19:23:30 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1NDrPlV019049; Thu, 24 Feb 2011 00:53:28 +1100 Received: from skywalker.ibm.com ([9.77.68.27]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p1NDqS24014791; Thu, 24 Feb 2011 00:53:18 +1100 From: "Aneesh Kumar K.V" To: sfrench@us.ibm.com, agruen@linbit.com, dilger.kernel@dilger.ca, sandeen@redhat.com, tytso@mit.edu, bfields@fieldses.org, jlayton@redhat.com Cc: aneesh.kumar@linux.vnet.ibm.com, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Gruenbacher Subject: [PATCH -V5 11/24] vfs: Make acl_permission_check() work for richacls Date: Wed, 23 Feb 2011 19:21:58 +0530 Message-Id: <1298469131-16555-12-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1298469131-16555-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1298469131-16555-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 23 Feb 2011 13:59:10 +0000 (UTC) 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 {