From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Gruenbacher Subject: Re: [PATCH v23 20/22] vfs: Add richacl permission checking Date: Thu, 14 Jul 2016 22:59:16 +0200 Message-ID: References: <1467294433-3222-1-git-send-email-agruenba@redhat.com> <1467294433-3222-21-git-send-email-agruenba@redhat.com> <1468325634.7798.24.camel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Alexander Viro , Christoph Hellwig , "Theodore Ts'o" , Andreas Dilger , "J. Bruce Fields" , Trond Myklebust , Anna Schumaker , Dave Chinner , linux-ext4 , XFS Developers , LKML , linux-fsdevel , Linux NFS Mailing List , linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Linux API To: Jeff Layton Return-path: In-Reply-To: <1468325634.7798.24.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Sender: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-cifs.vger.kernel.org On Tue, Jul 12, 2016 at 2:13 PM, Jeff Layton wrote: > On Thu, 2016-06-30 at 15:47 +0200, Andreas Gruenbacher wrote: >> Hook the richacl permission checking function into the vfs. >> >> Signed-off-by: Andreas Gruenbacher >> --- >> fs/namei.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- >> 1 file changed, 52 insertions(+), 2 deletions(-) >> >> diff --git a/fs/namei.c b/fs/namei.c >> index 7a822d0..48c9958 100644 >> --- a/fs/namei.c >> +++ b/fs/namei.c >> @@ -34,6 +34,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -256,7 +257,43 @@ void putname(struct filename *name) >> __putname(name); >> } >> >> -static int check_acl(struct inode *inode, int mask) >> +static int check_richacl(struct inode *inode, int mask) >> +{ >> +#ifdef CONFIG_FS_RICHACL >> + if (mask & MAY_NOT_BLOCK) { >> + struct base_acl *base_acl; >> + >> + base_acl = rcu_dereference(inode->i_acl); >> + if (!base_acl) >> + goto no_acl; >> + /* no ->get_richacl() calls in RCU mode... */ >> + if (is_uncached_acl(base_acl)) >> + return -ECHILD; >> + return richacl_permission(inode, richacl(base_acl), >> + mask & ~MAY_NOT_BLOCK); >> + } else { >> + struct richacl *acl; >> + >> + acl = get_richacl(inode); >> + if (IS_ERR(acl)) >> + return PTR_ERR(acl); >> + if (acl) { >> + int error = richacl_permission(inode, acl, mask); >> + richacl_put(acl); >> + return error; >> + } >> + } >> +no_acl: >> +#endif > > nit: Can you move the above to a static inline or something that becomes a noop when the config var is turned off? We could move check_richacl into richacl.c and check_posix_acl into posix_acl.c. Given that those functions are currently only called once in namei.c, that's a very small improvement at most though. >> + if (mask & (MAY_DELETE_SELF | MAY_TAKE_OWNERSHIP | >> + MAY_CHMOD | MAY_SET_TIMES)) { >> + /* File permission bits cannot grant this. */ >> + return -EACCES; >> + } >> + return -EAGAIN; >> +} >> + >> +static int check_posix_acl(struct inode *inode, int mask) >> { >> #ifdef CONFIG_FS_POSIX_ACL >> if (mask & MAY_NOT_BLOCK) { >> @@ -294,11 +331,24 @@ static int acl_permission_check(struct inode *inode, int mask) >> { >> unsigned int mode = inode->i_mode; >> >> + /* >> + * With POSIX ACLs, the (mode & S_IRWXU) bits exactly match the owner >> + * permissions, and we can skip checking posix acls for the owner. >> + * With richacls, the owner may be granted fewer permissions than the >> + * mode bits seem to suggest (for example, append but not write), and >> + * we always need to check the richacl. >> + */ >> + >> + if (IS_RICHACL(inode)) { >> + int error = check_richacl(inode, mask); >> + if (error != -EAGAIN) >> + return error; >> + } >> if (likely(uid_eq(current_fsuid(), inode->i_uid))) >> mode >>= 6; >> else { >> if (IS_POSIXACL(inode) && (mode & S_IRWXG)) { >> - int error = check_acl(inode, mask); >> + int error = check_posix_acl(inode, mask); >> if (error != -EAGAIN) >> return error; >> } > > Looks fine other than the nit above: > > Reviewed-by: Jeff Layton Thanks, Andreas From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334AbcGNU7W (ORCPT ); Thu, 14 Jul 2016 16:59:22 -0400 Received: from mail-vk0-f41.google.com ([209.85.213.41]:36562 "EHLO mail-vk0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbcGNU7R (ORCPT ); Thu, 14 Jul 2016 16:59:17 -0400 MIME-Version: 1.0 In-Reply-To: <1468325634.7798.24.camel@redhat.com> References: <1467294433-3222-1-git-send-email-agruenba@redhat.com> <1467294433-3222-21-git-send-email-agruenba@redhat.com> <1468325634.7798.24.camel@redhat.com> From: Andreas Gruenbacher Date: Thu, 14 Jul 2016 22:59:16 +0200 Message-ID: Subject: Re: [PATCH v23 20/22] vfs: Add richacl permission checking To: Jeff Layton Cc: Alexander Viro , Christoph Hellwig , "Theodore Ts'o" , Andreas Dilger , "J. Bruce Fields" , Trond Myklebust , Anna Schumaker , Dave Chinner , linux-ext4 , XFS Developers , LKML , linux-fsdevel , Linux NFS Mailing List , linux-cifs@vger.kernel.org, Linux API Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 12, 2016 at 2:13 PM, Jeff Layton wrote: > On Thu, 2016-06-30 at 15:47 +0200, Andreas Gruenbacher wrote: >> Hook the richacl permission checking function into the vfs. >> >> Signed-off-by: Andreas Gruenbacher >> --- >> fs/namei.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- >> 1 file changed, 52 insertions(+), 2 deletions(-) >> >> diff --git a/fs/namei.c b/fs/namei.c >> index 7a822d0..48c9958 100644 >> --- a/fs/namei.c >> +++ b/fs/namei.c >> @@ -34,6 +34,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -256,7 +257,43 @@ void putname(struct filename *name) >> __putname(name); >> } >> >> -static int check_acl(struct inode *inode, int mask) >> +static int check_richacl(struct inode *inode, int mask) >> +{ >> +#ifdef CONFIG_FS_RICHACL >> + if (mask & MAY_NOT_BLOCK) { >> + struct base_acl *base_acl; >> + >> + base_acl = rcu_dereference(inode->i_acl); >> + if (!base_acl) >> + goto no_acl; >> + /* no ->get_richacl() calls in RCU mode... */ >> + if (is_uncached_acl(base_acl)) >> + return -ECHILD; >> + return richacl_permission(inode, richacl(base_acl), >> + mask & ~MAY_NOT_BLOCK); >> + } else { >> + struct richacl *acl; >> + >> + acl = get_richacl(inode); >> + if (IS_ERR(acl)) >> + return PTR_ERR(acl); >> + if (acl) { >> + int error = richacl_permission(inode, acl, mask); >> + richacl_put(acl); >> + return error; >> + } >> + } >> +no_acl: >> +#endif > > nit: Can you move the above to a static inline or something that becomes a noop when the config var is turned off? We could move check_richacl into richacl.c and check_posix_acl into posix_acl.c. Given that those functions are currently only called once in namei.c, that's a very small improvement at most though. >> + if (mask & (MAY_DELETE_SELF | MAY_TAKE_OWNERSHIP | >> + MAY_CHMOD | MAY_SET_TIMES)) { >> + /* File permission bits cannot grant this. */ >> + return -EACCES; >> + } >> + return -EAGAIN; >> +} >> + >> +static int check_posix_acl(struct inode *inode, int mask) >> { >> #ifdef CONFIG_FS_POSIX_ACL >> if (mask & MAY_NOT_BLOCK) { >> @@ -294,11 +331,24 @@ static int acl_permission_check(struct inode *inode, int mask) >> { >> unsigned int mode = inode->i_mode; >> >> + /* >> + * With POSIX ACLs, the (mode & S_IRWXU) bits exactly match the owner >> + * permissions, and we can skip checking posix acls for the owner. >> + * With richacls, the owner may be granted fewer permissions than the >> + * mode bits seem to suggest (for example, append but not write), and >> + * we always need to check the richacl. >> + */ >> + >> + if (IS_RICHACL(inode)) { >> + int error = check_richacl(inode, mask); >> + if (error != -EAGAIN) >> + return error; >> + } >> if (likely(uid_eq(current_fsuid(), inode->i_uid))) >> mode >>= 6; >> else { >> if (IS_POSIXACL(inode) && (mode & S_IRWXG)) { >> - int error = check_acl(inode, mask); >> + int error = check_posix_acl(inode, mask); >> if (error != -EAGAIN) >> return error; >> } > > Looks fine other than the nit above: > > Reviewed-by: Jeff Layton Thanks, Andreas From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 0FC4B7CA2 for ; Thu, 14 Jul 2016 17:38:35 -0500 (CDT) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 74F51AC003 for ; Thu, 14 Jul 2016 15:38:34 -0700 (PDT) Received: from mail-vk0-f47.google.com (mail-vk0-f47.google.com [209.85.213.47]) by cuda.sgi.com with ESMTP id KAC2u6ktpnzCggdJ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO) for ; Thu, 14 Jul 2016 15:38:32 -0700 (PDT) Received: by mail-vk0-f47.google.com with SMTP id x130so132075816vkc.0 for ; Thu, 14 Jul 2016 15:38:32 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1468325634.7798.24.camel@redhat.com> References: <1467294433-3222-1-git-send-email-agruenba@redhat.com> <1467294433-3222-21-git-send-email-agruenba@redhat.com> <1468325634.7798.24.camel@redhat.com> From: Andreas Gruenbacher Date: Thu, 14 Jul 2016 22:59:16 +0200 Message-ID: Subject: Re: [PATCH v23 20/22] vfs: Add richacl permission checking List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Jeff Layton Cc: "J. Bruce Fields" , Linux NFS Mailing List , Theodore Ts'o , linux-cifs@vger.kernel.org, Linux API , Trond Myklebust , LKML , XFS Developers , Christoph Hellwig , Andreas Dilger , Alexander Viro , linux-fsdevel , linux-ext4 , Anna Schumaker On Tue, Jul 12, 2016 at 2:13 PM, Jeff Layton wrote: > On Thu, 2016-06-30 at 15:47 +0200, Andreas Gruenbacher wrote: >> Hook the richacl permission checking function into the vfs. >> >> Signed-off-by: Andreas Gruenbacher >> --- >> fs/namei.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- >> 1 file changed, 52 insertions(+), 2 deletions(-) >> >> diff --git a/fs/namei.c b/fs/namei.c >> index 7a822d0..48c9958 100644 >> --- a/fs/namei.c >> +++ b/fs/namei.c >> @@ -34,6 +34,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -256,7 +257,43 @@ void putname(struct filename *name) >> __putname(name); >> } >> >> -static int check_acl(struct inode *inode, int mask) >> +static int check_richacl(struct inode *inode, int mask) >> +{ >> +#ifdef CONFIG_FS_RICHACL >> + if (mask & MAY_NOT_BLOCK) { >> + struct base_acl *base_acl; >> + >> + base_acl = rcu_dereference(inode->i_acl); >> + if (!base_acl) >> + goto no_acl; >> + /* no ->get_richacl() calls in RCU mode... */ >> + if (is_uncached_acl(base_acl)) >> + return -ECHILD; >> + return richacl_permission(inode, richacl(base_acl), >> + mask & ~MAY_NOT_BLOCK); >> + } else { >> + struct richacl *acl; >> + >> + acl = get_richacl(inode); >> + if (IS_ERR(acl)) >> + return PTR_ERR(acl); >> + if (acl) { >> + int error = richacl_permission(inode, acl, mask); >> + richacl_put(acl); >> + return error; >> + } >> + } >> +no_acl: >> +#endif > > nit: Can you move the above to a static inline or something that becomes a noop when the config var is turned off? We could move check_richacl into richacl.c and check_posix_acl into posix_acl.c. Given that those functions are currently only called once in namei.c, that's a very small improvement at most though. >> + if (mask & (MAY_DELETE_SELF | MAY_TAKE_OWNERSHIP | >> + MAY_CHMOD | MAY_SET_TIMES)) { >> + /* File permission bits cannot grant this. */ >> + return -EACCES; >> + } >> + return -EAGAIN; >> +} >> + >> +static int check_posix_acl(struct inode *inode, int mask) >> { >> #ifdef CONFIG_FS_POSIX_ACL >> if (mask & MAY_NOT_BLOCK) { >> @@ -294,11 +331,24 @@ static int acl_permission_check(struct inode *inode, int mask) >> { >> unsigned int mode = inode->i_mode; >> >> + /* >> + * With POSIX ACLs, the (mode & S_IRWXU) bits exactly match the owner >> + * permissions, and we can skip checking posix acls for the owner. >> + * With richacls, the owner may be granted fewer permissions than the >> + * mode bits seem to suggest (for example, append but not write), and >> + * we always need to check the richacl. >> + */ >> + >> + if (IS_RICHACL(inode)) { >> + int error = check_richacl(inode, mask); >> + if (error != -EAGAIN) >> + return error; >> + } >> if (likely(uid_eq(current_fsuid(), inode->i_uid))) >> mode >>= 6; >> else { >> if (IS_POSIXACL(inode) && (mode & S_IRWXG)) { >> - int error = check_acl(inode, mask); >> + int error = check_posix_acl(inode, mask); >> if (error != -EAGAIN) >> return error; >> } > > Looks fine other than the nit above: > > Reviewed-by: Jeff Layton Thanks, Andreas _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs