From nobody Tue Mar 31 01:07:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fl92z3RfFz6WTSC for ; Tue, 31 Mar 2026 01:07:55 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fl92z0Y9Hz3fjj for ; Tue, 31 Mar 2026 01:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774919275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+hmroDfmLGUsR5cwtuFoaiBr3a6h0sxIHlLXj8fIPE=; b=mWXDiv7XgGGSS9RKxenzMrjubdmXMczg6CxBQiJsX1vNmMsa3y7E35nqtx8n7YqljfrrHW h+FmvbQ7/DS4KE6pSXEVJ5Ij82MNS5j9qzpv2LWMvGcZhyqpwhc77q9CDbLk/RRN0rjloi pPJPSiboJ1qCz4pLsCUkwKcphQMcCegZx0RC7fDr8fRji+qk28Rmi0+VqjSJ+yCFI5jZXG dYgKhfZJa5eRk7Ht1zhETGiR5gF343g4gZh56xD6URidKPqiG3N9TFO7up8C+UQJD6LAJS qKj3wrPDgi05pKs8RcH95l9xghg7gpde7I8m0VL4RplTz5Yd7NadVEYgsBoLeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774919275; a=rsa-sha256; cv=none; b=CdhsRy78DzRjgpWyk1oz9HTiEmCXHQ9lOMO1WRJH6q9ITEjsdmtMrsCBqeBvk5LZLHjcv4 RuZW+t+IZObCZuCjtEPWgA5pAhktw0I0b5tr3EKCmGJt0ywWR0HIEszjuM0vvRLkqqpQdV bxKmn7p03zaDHEQuQ1OwUj5kboUlHTE0AR05FTz5aD4oW1kRKPkW3iH/ZMT1c352B9kACc PoHrWxiTnIAyMcvvoDvJYfvKxxtTU/USoQuxSuVBxiYuJhbJN5YRkReT7HBqwqWCIcUIvK 6J2Y/adZIwJuXT+UrbEuKpTbWp0EA0ztYLy/o+I89eDk0U0BeyLyzbHFZxy8pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774919275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+hmroDfmLGUsR5cwtuFoaiBr3a6h0sxIHlLXj8fIPE=; b=NQddvwlQaUfxUgRKT9ZIzEY5OShj68++YSuVE1QBsAQmbMPO4kyiL4xzwFgh2+scOiYYu0 1tjjyjiEB0mLV0ll9gHJPKXiG5SVGbQRzzStAAFZTdhLDD9YBRRTYxtl6ogTs2pUEDsQUD 5GohwByrUhafGOBqtGSXGikO4KvXLUhcO/7MTFCfCobaGa8Dtcmq++lXQlXbg8pzo3J4rz avCaQ7+Ej74sQE6BzzcvSVNonCNf0M7OgcM6hRIAUw5fbeG8xzwcLsYLi19ve1X6lI11oV Sfs4s/ooi03bqzSXNGXnDKOQZZVbKmiufYwrddbshKXavJ+JNsq2qr+zLWFY/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fl92y70hnz16Lq for ; Tue, 31 Mar 2026 01:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a90b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 01:07:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: cea122acd9be - stable/15 - nfs_nfsdserv.c: Fix handling of archive flag for mkdir List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cea122acd9beeae5a815733614a77acd60a87899 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 01:07:49 +0000 Message-Id: <69cb1e65.1a90b.17a69c42@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cea122acd9beeae5a815733614a77acd60a87899 commit cea122acd9beeae5a815733614a77acd60a87899 Author: Rick Macklem AuthorDate: 2026-03-16 23:22:37 +0000 Commit: Rick Macklem CommitDate: 2026-03-31 01:05:42 +0000 nfs_nfsdserv.c: Fix handling of archive flag for mkdir An NFSv4.1/4.2 client can set/clear the archive, hidden and system flags when creating non-regular files, such as directories. Without this patch, the setting of va_flags causes an EPERM failure, since they are specified for VOP_MKDIR(), VOP_MKNOD() and VOP_SYMLINK(). This patch sets va_flags == VNOVAL for the above VOP_xxx() calls and then sets/clears the flags after creation, which fixes the problem. This bug only affects the Windows NFSv4.1/4.2 client. PR: 293691 (cherry picked from commit 6580d040861dfbf6c630a93cbf41f2a2c7e7b327) --- sys/fs/nfsserver/nfs_nfsdserv.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index ed1b708187e6..bf0f638c52bb 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -1438,7 +1438,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, vnode_t vp, dirp = NULL; nfsattrbit_t attrbits; char *bufp = NULL, *pathcp = NULL; - u_long *hashp, cnflags; + u_long *hashp, cnflags, setflags; NFSACL_T *aclp = NULL, *daclp = NULL; struct thread *p = curthread; @@ -1605,9 +1605,13 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, } } + /* For NFSv4, set na_flags via nfsrv_fixattr(). */ + setflags = nva.na_flags; + nva.na_flags = VNOVAL; nd->nd_repstat = nfsvno_mknod(&named, &nva, nd->nd_cred, p); if (!nd->nd_repstat) { vp = named.ni_vp; + nva.na_flags = setflags; nfsrv_fixattr(nd, vp, &nva, aclp, daclp, p, &attrbits, false); nd->nd_repstat = nfsvno_getfh(vp, fhp, p); if ((nd->nd_flag & ND_NFSV3) && !nd->nd_repstat) @@ -2115,10 +2119,14 @@ nfsrvd_symlinksub(struct nfsrv_descript *nd, struct nameidata *ndp, int pathlen) { u_int32_t *tl; + u_long setflags; + setflags = nvap->na_flags; + nvap->na_flags = (u_long)VNOVAL; nd->nd_repstat = nfsvno_symlink(ndp, nvap, pathcp, pathlen, !(nd->nd_flag & ND_NFSV2), nd->nd_saveduid, nd->nd_cred, p, exp); if (!nd->nd_repstat && !(nd->nd_flag & ND_NFSV2)) { + nvap->na_flags = setflags; nfsrv_fixattr(nd, ndp->ni_vp, nvap, aclp, NULL, p, attrbitp, false); if (nd->nd_flag & ND_NFSV3) { @@ -2249,12 +2257,16 @@ nfsrvd_mkdirsub(struct nfsrv_descript *nd, struct nameidata *ndp, { vnode_t vp; u_int32_t *tl; + u_long setflags; + setflags = nvap->na_flags; + nvap->na_flags = (u_long)VNOVAL; NFSVNO_SETATTRVAL(nvap, type, VDIR); nd->nd_repstat = nfsvno_mkdir(ndp, nvap, nd->nd_saveduid, nd->nd_cred, p, exp); if (!nd->nd_repstat) { vp = ndp->ni_vp; + nvap->na_flags = setflags; nfsrv_fixattr(nd, vp, nvap, aclp, daclp, p, attrbitp, false); nd->nd_repstat = nfsvno_getfh(vp, fhp, p); if (!(nd->nd_flag & ND_NFSV4) && !nd->nd_repstat)