From owner-svn-src-projects@freebsd.org Fri Sep 13 01:07:20 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22874E0ADD for ; Fri, 13 Sep 2019 01:07:20 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46TyCr05F5z3yys; Fri, 13 Sep 2019 01:07:20 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DAACB274C5; Fri, 13 Sep 2019 01:07:19 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8D17JFr036504; Fri, 13 Sep 2019 01:07:19 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8D17JUS036503; Fri, 13 Sep 2019 01:07:19 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201909130107.x8D17JUS036503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 13 Sep 2019 01:07:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r352270 - projects/nfsv42/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfsserver X-SVN-Commit-Revision: 352270 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2019 01:07:20 -0000 Author: rmacklem Date: Fri Sep 13 01:07:19 2019 New Revision: 352270 URL: https://svnweb.freebsd.org/changeset/base/352270 Log: Add support for the Extended Attribute Access bits. RFC-8276 defines three additional bits for the Access operation. This patch adds support to the NFSv4.2 server for these. The client does not use these bits. Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Fri Sep 13 01:03:54 2019 (r352269) +++ projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Fri Sep 13 01:07:19 2019 (r352270) @@ -124,7 +124,8 @@ nfsrvd_access(struct nfsrv_descript *nd, __unused int if ((nd->nd_flag & ND_NFSV4) && (nfsmode & ~(NFSACCESS_READ | NFSACCESS_LOOKUP | NFSACCESS_MODIFY | NFSACCESS_EXTEND | NFSACCESS_DELETE | - NFSACCESS_EXECUTE))) { + NFSACCESS_EXECUTE | NFSACCESS_XAREAD | NFSACCESS_XAWRITE | + NFSACCESS_XALIST))) { nd->nd_repstat = NFSERR_INVAL; vput(vp); goto out; @@ -146,6 +147,24 @@ nfsrvd_access(struct nfsrv_descript *nd, __unused int if (nfsvno_accchk(vp, VWRITE | VAPPEND, nd->nd_cred, exp, p, NFSACCCHK_NOOVERRIDE, NFSACCCHK_VPISLOCKED, &supported)) nfsmode &= ~NFSACCESS_EXTEND; + } + if (nfsmode & NFSACCESS_XAREAD) { + supported |= NFSACCESS_XAREAD; + if (nfsvno_accchk(vp, VREAD, nd->nd_cred, exp, p, + NFSACCCHK_NOOVERRIDE, NFSACCCHK_VPISLOCKED, &supported)) + nfsmode &= ~NFSACCESS_XAREAD; + } + if (nfsmode & NFSACCESS_XAWRITE) { + supported |= NFSACCESS_XAWRITE; + if (nfsvno_accchk(vp, VWRITE, nd->nd_cred, exp, p, + NFSACCCHK_NOOVERRIDE, NFSACCCHK_VPISLOCKED, &supported)) + nfsmode &= ~NFSACCESS_XAWRITE; + } + if (nfsmode & NFSACCESS_XALIST) { + supported |= NFSACCESS_XALIST; + if (nfsvno_accchk(vp, VREAD, nd->nd_cred, exp, p, + NFSACCCHK_NOOVERRIDE, NFSACCCHK_VPISLOCKED, &supported)) + nfsmode &= ~NFSACCESS_XALIST; } if (nfsmode & NFSACCESS_DELETE) { supported |= NFSACCESS_DELETE;