From patchwork Mon Oct 5 19:36:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 7330861 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4FF799F32B for ; Mon, 5 Oct 2015 19:51:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CA5020640 for ; Mon, 5 Oct 2015 19:51:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B83F3206A0 for ; Mon, 5 Oct 2015 19:51:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752446AbbJETvU (ORCPT ); Mon, 5 Oct 2015 15:51:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53163 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752104AbbJETkO (ORCPT ); Mon, 5 Oct 2015 15:40:14 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 43C8EA2C36; Mon, 5 Oct 2015 19:40:14 +0000 (UTC) Received: from nux.home.com (vpn1-7-226.ams2.redhat.com [10.36.7.226]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t95JbDHl018133; Mon, 5 Oct 2015 15:40:09 -0400 From: Andreas Gruenbacher To: Alexander Viro , "Theodore Ts'o" , Andreas Dilger , "J. Bruce Fields" , Jeff Layton , Trond Myklebust , Anna Schumaker , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH v9 32/43] nfsd: Add richacl support Date: Mon, 5 Oct 2015 21:36:59 +0200 Message-Id: <1444073830-21854-33-git-send-email-agruenba@redhat.com> In-Reply-To: <1444073830-21854-1-git-send-email-agruenba@redhat.com> References: <1444073830-21854-1-git-send-email-agruenba@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On file systems with richacls enabled, get and set richacls directly instead of converting from / to posix acls. Signed-off-by: Andreas Gruenbacher Acked-by: J. Bruce Fields --- fs/nfsd/acl.h | 3 +- fs/nfsd/nfs4acl.c | 124 ++++++++++++++++++++++++++++++++++++++--------------- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 34 +++++++++++---- 4 files changed, 117 insertions(+), 46 deletions(-) diff --git a/fs/nfsd/acl.h b/fs/nfsd/acl.h index 1c5deb5..d73c664 100644 --- a/fs/nfsd/acl.h +++ b/fs/nfsd/acl.h @@ -53,8 +53,7 @@ __be32 nfsd4_decode_ace_who(struct richace *ace, struct svc_rqst *rqstp, __be32 nfsd4_encode_ace_who(struct xdr_stream *xdr, struct svc_rqst *rqstp, struct richace *ace); -int nfsd4_get_acl(struct svc_rqst *rqstp, struct dentry *dentry, - struct richacl **acl); +struct richacl *nfsd4_get_acl(struct svc_rqst *rqstp, struct dentry *dentry); __be32 nfsd4_set_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, struct richacl *acl); diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index 6d3bb72..f017a76 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c @@ -40,6 +40,8 @@ #include #include #include +#include +#include #include "nfsfh.h" #include "nfsd.h" @@ -129,32 +131,28 @@ static short ace2type(struct richace *); static void _posix_to_richacl_one(struct posix_acl *, struct richacl_alloc *, unsigned int); -int -nfsd4_get_acl(struct svc_rqst *rqstp, struct dentry *dentry, - struct richacl **acl) +static struct richacl * +nfsd4_get_posix_acl(struct svc_rqst *rqstp, struct dentry *dentry) { struct inode *inode = d_inode(dentry); - int error = 0; struct posix_acl *pacl = NULL, *dpacl = NULL; struct richacl_alloc alloc; unsigned int flags = 0; int count; pacl = get_acl(inode, ACL_TYPE_ACCESS); - if (!pacl) - pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL); - - if (IS_ERR(pacl)) - return PTR_ERR(pacl); + if (IS_ERR_OR_NULL(pacl)) + return (void *)pacl; - /* allocate for worst case: one (deny, allow) pair each: */ + /* Allocate for worst case: one (deny, allow) pair each. The resulting + acl will be released shortly and won't be cached. */ count = 2 * pacl->a_count; if (S_ISDIR(inode->i_mode)) { flags = FLAG_DIRECTORY; dpacl = get_acl(inode, ACL_TYPE_DEFAULT); if (IS_ERR(dpacl)) { - error = PTR_ERR(dpacl); + alloc.acl = (void *)dpacl; goto rel_pacl; } @@ -163,7 +161,7 @@ nfsd4_get_acl(struct svc_rqst *rqstp, struct dentry *dentry, } if (!richacl_prepare(&alloc, count)) { - error = -ENOMEM; + alloc.acl = ERR_PTR(-ENOMEM); goto out; } @@ -172,13 +170,37 @@ nfsd4_get_acl(struct svc_rqst *rqstp, struct dentry *dentry, if (dpacl) _posix_to_richacl_one(dpacl, &alloc, flags | FLAG_DEFAULT_ACL); - *acl = alloc.acl; - out: posix_acl_release(dpacl); rel_pacl: posix_acl_release(pacl); - return error; + return alloc.acl; +} + +struct richacl * +nfsd4_get_acl(struct svc_rqst *rqstp, struct dentry *dentry) +{ + struct inode *inode = d_inode(dentry); + struct richacl *acl; + int error; + + if (IS_RICHACL(inode)) + acl = get_richacl(inode); + else + acl = nfsd4_get_posix_acl(rqstp, dentry); + if (IS_ERR(acl)) + return acl; + else if (acl == NULL) { + acl = richacl_from_mode(inode->i_mode); + if (acl == NULL) + acl = ERR_PTR(-ENOMEM); + } + error = richacl_apply_masks(&acl, inode->i_uid); + if (error) { + richacl_put(acl); + acl = ERR_PTR(error); + } + return acl; } struct posix_acl_summary { @@ -744,56 +766,88 @@ out_estate: return ret; } -__be32 -nfsd4_set_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, struct richacl *acl) +static int +nfsd4_set_posix_acl(struct svc_rqst *rqstp, struct dentry *dentry, + struct richacl *acl) { - __be32 error; int host_error; - struct dentry *dentry; - struct inode *inode; + struct inode *inode = d_inode(dentry); struct posix_acl *pacl = NULL, *dpacl = NULL; unsigned int flags = 0; - /* Get inode */ - error = fh_verify(rqstp, fhp, 0, NFSD_MAY_SATTR); - if (error) - return error; - - dentry = fhp->fh_dentry; - inode = d_inode(dentry); - if (!inode->i_op->set_acl || !IS_POSIXACL(inode)) - return nfserr_attrnotsupp; + return -EOPNOTSUPP; if (S_ISDIR(inode->i_mode)) flags = FLAG_DIRECTORY; host_error = nfs4_richacl_to_posix(acl, &pacl, &dpacl, flags); if (host_error == -EINVAL) - return nfserr_attrnotsupp; + return -EOPNOTSUPP; if (host_error < 0) - goto out_nfserr; + return host_error; host_error = inode->i_op->set_acl(inode, pacl, ACL_TYPE_ACCESS); if (host_error < 0) goto out_release; - if (S_ISDIR(inode->i_mode)) { + if (S_ISDIR(inode->i_mode)) host_error = inode->i_op->set_acl(inode, dpacl, ACL_TYPE_DEFAULT); - } out_release: posix_acl_release(pacl); posix_acl_release(dpacl); -out_nfserr: + return host_error; +} + +static int +nfsd4_set_richacl(struct svc_rqst *rqstp, struct dentry *dentry, + struct richacl *acl) +{ + int host_error; + struct inode *inode = d_inode(dentry); + size_t size = richacl_xattr_size(acl); + char *buffer; + + if (!inode->i_op->setxattr || !IS_RICHACL(inode)) + return -EOPNOTSUPP; + + richacl_compute_max_masks(acl); + + buffer = kmalloc(size, GFP_KERNEL); + if (!buffer) + return -ENOMEM; + richacl_to_xattr(&init_user_ns, acl, buffer, size); + host_error = inode->i_op->setxattr(dentry, XATTR_NAME_RICHACL, + buffer, size, 0); + kfree(buffer); + return host_error; +} + +__be32 +nfsd4_set_acl(struct svc_rqst *rqstp, struct svc_fh *fhp, struct richacl *acl) +{ + struct dentry *dentry; + int host_error; + __be32 error; + + error = fh_verify(rqstp, fhp, 0, NFSD_MAY_SATTR); + if (error) + return error; + dentry = fhp->fh_dentry; + + if (IS_RICHACL(d_inode(dentry))) + host_error = nfsd4_set_richacl(rqstp, dentry, acl); + else + host_error = nfsd4_set_posix_acl(rqstp, dentry, acl); + if (host_error == -EOPNOTSUPP) return nfserr_attrnotsupp; else return nfserrno(host_error); } - static short ace2type(struct richace *ace) { diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 2430235..1bcfda2 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -110,7 +110,7 @@ check_attr_support(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, * in current environment or not. */ if (bmval[0] & FATTR4_WORD0_ACL) { - if (!IS_POSIXACL(d_inode(dentry))) + if (!IS_ACL(d_inode(dentry))) return nfserr_attrnotsupp; } diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 8603f40..682a7d8 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -340,11 +340,24 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, richacl_for_each_entry(ace, *acl) { READ_BUF(16); len += 16; - ace->e_type = be32_to_cpup(p++); - ace->e_flags = be32_to_cpup(p++); - ace->e_mask = be32_to_cpup(p++); - if (ace->e_flags & RICHACE_SPECIAL_WHO) + + dummy32 = be32_to_cpup(p++); + if (dummy32 > RICHACE_ACCESS_DENIED_ACE_TYPE) + return nfserr_inval; + ace->e_type = dummy32; + + dummy32 = be32_to_cpup(p++); + if (dummy32 & (~RICHACE_VALID_FLAGS | + RICHACE_INHERITED_ACE | + RICHACE_SPECIAL_WHO)) return nfserr_inval; + ace->e_flags = dummy32; + + dummy32 = be32_to_cpup(p++); + if (dummy32 & ~NFS4_ACE_MASK_ALL) + return nfserr_inval; + ace->e_mask = dummy32; + dummy32 = be32_to_cpup(p++); READ_BUF(dummy32); len += XDR_QUADLEN(dummy32) << 2; @@ -2330,7 +2343,11 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, fhp = tempfh; } if (bmval0 & FATTR4_WORD0_ACL) { - err = nfsd4_get_acl(rqstp, dentry, &acl); + acl = nfsd4_get_acl(rqstp, dentry); + if (IS_ERR(acl)) { + err = PTR_ERR(acl); + acl = NULL; + } if (err == -EOPNOTSUPP) bmval0 &= ~FATTR4_WORD0_ACL; else if (err == -EINVAL) { @@ -2370,7 +2387,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, u32 word1 = nfsd_suppattrs1(minorversion); u32 word2 = nfsd_suppattrs2(minorversion); - if (!IS_POSIXACL(dentry->d_inode)) + if (!IS_ACL(d_inode(dentry))) word0 &= ~FATTR4_WORD0_ACL; if (!contextsupport) word2 &= ~FATTR4_WORD2_SECURITY_LABEL; @@ -2505,7 +2522,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, if (!p) goto out_resource; *p++ = cpu_to_be32(ace->e_type); - *p++ = cpu_to_be32(ace->e_flags & ~RICHACE_SPECIAL_WHO); + *p++ = cpu_to_be32(ace->e_flags & + ~(RICHACE_SPECIAL_WHO | RICHACE_INHERITED_ACE)); *p++ = cpu_to_be32(ace->e_mask & NFS4_ACE_MASK_ALL); status = nfsd4_encode_ace_who(xdr, rqstp, ace); if (status) @@ -2517,7 +2535,7 @@ out_acl: p = xdr_reserve_space(xdr, 4); if (!p) goto out_resource; - *p++ = cpu_to_be32(IS_POSIXACL(dentry->d_inode) ? + *p++ = cpu_to_be32(IS_ACL(d_inode(dentry)) ? ACL4_SUPPORT_ALLOW_ACL|ACL4_SUPPORT_DENY_ACL : 0); } if (bmval0 & FATTR4_WORD0_CANSETTIME) {