From nobody Sat Feb 11 15:15:12 2023 X-Original-To: dev-commits-src-main@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 4PDZ0c3z8Sz3p8ry; Sat, 11 Feb 2023 15:15:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PDZ0c3NVjz3tdw; Sat, 11 Feb 2023 15:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676128512; 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=gNjVSWwXVLCDR8M92qN3TAvxNYMVVdMs3LcjjXlQ8J0=; b=N9a/ZtIBOeRJ6r7Q50DhxRAYsbCcfRKCJsTaFsN2fHQqyECVVa4fzGYJlCkb33iwjSsABR URKHeSSq5BsoljaP0pIHfoleH3uJb9t1pkI32844KHYpziOjy7P5si3l0Fv4REZnPV/ihJ FFzQZ7c4vG8vJ5ftP3VxGY9o6qtxX3wwya0YSsYkG9Pj8nfSy4ePAyTJJsqIUtgXmeTESq tGFBsuBdlCyBBbkWKcYT9nQz02M1/NIjVZm18gyy9HWTBeVPIQ35iyOs4WINBs6npVi8pD w6kE0FLYZoHr1rJhiT0jcVVN/Ji+gdRj9nn+V3eqGiRCC3ezfFJxdO8C+kKkgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676128512; 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=gNjVSWwXVLCDR8M92qN3TAvxNYMVVdMs3LcjjXlQ8J0=; b=Yr32r0ExpOWx089GbxFKTydWQ33hLnDoy7adIDvgycJYBcQ+H5oYpu8itSSx0Cb75qy6w6 HwK1gVE8xtxsXBLuWVeUTBx5Tqm6qeQgU3KqRreeNExZ9T48nDYo1S2GXs8i+UmshD65nj ODuKqMJEu8H7pQaTEzOLpFlv7fOiKbFloBvlJ3MR5GH9UjAwaC3/+iDqxgEGuiSEAb0L8Q Fd0S8RS3Drsjmmf03I4TrvYYtLC8K9QfL+Z6GS7Y7hjEF4ZdKacdGuK0fIItDnpN73Ra0F jWEAJWRc9dCziroK1tWjBgd0NhSeZ3156Lig9snOntUkQZjG7gluHVzdhhhJuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676128512; a=rsa-sha256; cv=none; b=aIfn5Fct0bF5YKGZ3SvXqnBWvp21nQOAsOgVbbNcsRrDT+zk1MjzYMj9ZsmNFsVdnyXr3U f2gVofk692qrjAlHtV7VGbvTM6P2uA1+7d30iPmttOmsO7TnD62D0cD2y6VHa42Mm3ujM+ gWTjX5u6mk6eZIrFk6eY/9Q2MNSg35oXXQiSSTpIRg85gHfeFeT9xXskZ6nJGL/ezebQvn d3Nu+StMsJGvSVWJxACrQEQNdz15xDeI81NOWGmiHpIcGpqIdQflfMHyVrbEP5c3yZKo18 ATgldr6JqFanWaOBle+0Kvem/XH1G9thTIANwhX4e1sNfUULIcId/L+Uc/i2VA== 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 4PDZ0c2RLtz13Cw; Sat, 11 Feb 2023 15:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31BFFCjq046319; Sat, 11 Feb 2023 15:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31BFFC68046318; Sat, 11 Feb 2023 15:15:12 GMT (envelope-from git) Date: Sat, 11 Feb 2023 15:15:12 GMT Message-Id: <202302111515.31BFFC68046318@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: 5fd0916cdbfd - main - nfsd: Add a KASSERT in nfsvno_open List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 5fd0916cdbfdbaad620f3d5e7ff80e3436c640ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=5fd0916cdbfdbaad620f3d5e7ff80e3436c640ea commit 5fd0916cdbfdbaad620f3d5e7ff80e3436c640ea Author: Rick Macklem AuthorDate: 2023-02-11 15:14:08 +0000 Commit: Rick Macklem CommitDate: 2023-02-11 15:14:08 +0000 nfsd: Add a KASSERT in nfsvno_open Commit ded5f2954e1a defined done_namei to indicate that nd_repstat was set after a successful nfsvno_namei(), so that a cleanup needs to be done in nfsvno_open(). This only happens when nfsvno_namei() is done with CREATE. This patch adds a KASSERT() to check for that. PR: 268971 --- sys/fs/nfsserver/nfs_nfsdport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index daa57222fe22..9cd7f9320bd5 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -1926,6 +1926,8 @@ nfsvno_open(struct nfsrv_descript *nd, struct nameidata *ndp, } } } else if (done_namei) { + KASSERT(create == NFSV4OPEN_CREATE, + ("nfsvno_open: not create")); /* * done_namei is set when nfsvno_namei() has completed * successfully, but a subsequent error was set in