From nobody Fri Jul 18 18:50:53 2025 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 4bkJlf3YKkz62f4b; Fri, 18 Jul 2025 18:50:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bkJld3q8lz3gXC; Fri, 18 Jul 2025 18:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752864653; 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=TBBnOxoLfGsQQ4XB1YK1weWXGNvpogffTVYmJyHvz9A=; b=OyqKW9NykQNcTZx0NM0yDW5ee6wTaJlG8V6YX/oofmHqecw9JH0zd+dh9KXFc54szq+4Sf FSNgZAaMRdq6n+sT/Ay9770JFVtOJ5tRvaM+UHy5At0H+05CZu7Gul2iRq3uTEuAbC4NHB kpX6YJZK4Xccs3el4YB8Lll12NOPy1NgwNwTIaGBvpueYVSD4GqGP1wJpSFcqi8qED0ysc D7oZFR4kA/kV7fCTaAiQf9mYlurP74ym3eWW7TYsU17RqiXCDYRLRcqupiHm7oSiwWtTaH SKsP5Az8t8KuYnL971ohzMUEsVsDgSocASawr2XoroZM58Mevi2S3vWFRzZ0eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752864653; 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=TBBnOxoLfGsQQ4XB1YK1weWXGNvpogffTVYmJyHvz9A=; b=HcKm/rhBccXL2qqML6kEtO1LDTxq10Fo1O4hK/fTIL5DbeCNj0CG4cE1WXyuGQRN6mb7be 0Vo4K7hekLeA+aG4vJakCzlPPcrguDwTe05Diy1Q1CO0xKwHXvSNklzwLuPPVcFqcRNMAb n8CF8PsCbcLCwkriznysmlM1Ljej6gj0LbgTXnSoxYeOGuIKnOgVrrkQHmlFFsxknFy+FM CA28GlBYxfEuZw4bIn4QvSVB0ZeNcP4coj+YW1P2Q8G9e8+gUZh2XY1sXhqaXm6spgHTja 2St4ktDv2tG858jqgD4QlmeUoRVzLVt3vfEwupPZPOWum2pKiexq369BV7Acvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752864653; a=rsa-sha256; cv=none; b=vXLwXm3I6WqAaBdF1XKMGI23+QTOIQBlJTlbSBiMQps9EizvSB4wKtGc0Z8wY0i4M+/UBa CTMlDGrHeNPVZ3MQDgCSptkvgojBO765PI4q7jHpYZyIQjZTtxnVE4S6q/O2rC17mr+FKo yZhIMMkp9kSXh9INk49IAL4YIFUwJzBRqBWZoY9QPszu4RhXBS9OWeTSpFtonaPr5KycMJ AfdiQFEIYqWAGb1+5vG/q6xl7rLRVGHz3Vt43x8GFhQalZsAPFqKlP6NSeUFhT3ez29V2k 9ZMarF0J6A20c4jREQCBZL7oRS53+mjje9GYo5QZvoVrCetoBrCzOR2us8KE3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bkJld3B6JzspN; Fri, 18 Jul 2025 18:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56IIorTf055584; Fri, 18 Jul 2025 18:50:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56IIorhK055581; Fri, 18 Jul 2025 18:50:53 GMT (envelope-from git) Date: Fri, 18 Jul 2025 18:50:53 GMT Message-Id: <202507181850.56IIorhK055581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: cf2ff49e6e5e - main - nfs_nfsdserv.c: Fix nfsrvd_openattr() for vnode locking 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/main X-Git-Reftype: branch X-Git-Commit: cf2ff49e6e5e3b9ac28e4f853a6ec9d9599d69b1 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cf2ff49e6e5e3b9ac28e4f853a6ec9d9599d69b1 commit cf2ff49e6e5e3b9ac28e4f853a6ec9d9599d69b1 Author: Rick Macklem AuthorDate: 2025-07-18 18:47:59 +0000 Commit: Rick Macklem CommitDate: 2025-07-18 18:47:59 +0000 nfs_nfsdserv.c: Fix nfsrvd_openattr() for vnode locking Without this patch, nfsrvd_openattr() requests an unlocked vnode via VOP_LOOKUP(). This is not allowed for "options DEBUG_VFS_LOCKS" kernels, so this patch requests a locked vnode and then unlocks it. Fixes: e4c7b2b6053f ("nfsv4: Add support to NFSv4 for named attributes") --- sys/fs/nfsserver/nfs_nfsdserv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index f7564ade401b..3acf07d5253b 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -4353,9 +4353,10 @@ nfsrvd_openattr(struct nfsrv_descript *nd, __unused int isdgram, int error = 0; NFSNAMEICNDSET(&cn, nd->nd_cred, LOOKUP, OPENNAMED | ISLASTCN | - NOFOLLOW); + NOFOLLOW | LOCKLEAF); cn.cn_nameptr = "."; cn.cn_namelen = 1; + cn.cn_lkflags = LK_SHARED; NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); if (*tl == newnfs_true) cn.cn_flags |= CREATENAMED; @@ -4374,6 +4375,8 @@ nfsrvd_openattr(struct nfsrv_descript *nd, __unused int isdgram, if (nd->nd_repstat == ENOATTR) nd->nd_repstat = NFSERR_NOENT; } + if (nd->nd_repstat == 0) + NFSVOPUNLOCK(*vpp); vput(dp); NFSEXITCODE2(0, nd);