From nobody Tue Nov 17 17:08:09 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 4jTWQK5C6tz71SWq for ; Tue, 17 Nov 2026 17:08:09 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWQK3dwhz4Mlg for ; Tue, 17 Nov 2026 17:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IAUVovQJjmd/NccQ9tTeOJM8gila3D8JHunmEt43GQQ=; b=oQTI2nWfnej1HkOMPhqfWmprFdS1XUX1O7ZpprNQt5FbZWD3wwB7I/aiLO0PNvXencjy0q K7y54DkWA/aRfA8mf1Im6ktIL1KzURj8aCPtldKTFci8T2bxA+ApZsVHsd4qZAyKdvPOAR UFhFiCFz3lK7XGwk03KGUKYg7+KzuaroSRS0Ps/nj3eqspuW9ZC/EU8s/luuMheU8qVOYi 4Dy6+mTeEHhZcy/orG3uhNKl68sBjUsvu67ilcC0b6br5cqWH8kreMv3755Vxb2FWlclDJ rSjWB9lxFNRpNRkOftltomMWBPs8+/GYYSw+cCkrYkvpbNwcM7AuGiqkcj95JA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935289; b=hTVxYunwMhuL489od96+YgajUqd8/wkGzRjqjNwIgTgqvCD5jmCWTK2o28VlL0QwwLU6+U xwTjD+Y1brIWvTqY2RTlKHcGOez82vqAn4iHKgd/6PxEwUSCvhekRUj9VxTUN3HW/+3uRv RKANl6HmDecyjR3ggKRoKzG3hnMROAqck78iLOo9oVSWs+6QFMzFd1dzU7mo//86guun4c kVMH45CQI0PYdDJHqzh/jr+XTBUNl56e5+E6Yx7OWXpqJKbYYLJBSsmtA8JaWXrdGf42YC 6D7klDRZZS5WQX6vCy6a7t1FP0NwZFos3Fhgr8ZWIFdkK0A+hS6WKA1MKuSaoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IAUVovQJjmd/NccQ9tTeOJM8gila3D8JHunmEt43GQQ=; b=r7+NRjH7V5qHN74BJ5yQRjwzrdYg1cM9WTtkkR0sfAzzt4iypp2CP8X5ojwdBUQ72U6Hsu jtu/Y20VWMvfGEfFclC1Ps1jBq5oXUqAq8HGGc/Zov0Cfcdf6i9MMxzbXZky9aK6FY7/Og RiUJpGtiVXbN15iy9dTw+wDML+lfScJ8vy2qbATE3a950XT7LGdtK6k9l7h788chYF+6IJ WC6l5wsnDTkQvZT6Uh6L9AwR09xtZvuf1BT5gaq4AFvvnvNU7Dnk/qRqgDQ8zOvpxThCSb uOKvIDv+tw4/5dIl1cg5t1J09erO34ZglLO9l0JsGmzImyufe0BzbTlIG9jlbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWQK3K0Qzrk9 for ; Tue, 17 Nov 2026 17:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rick Macklem From: Mark Johnston Subject: git: 2b58bfa57245 - releng/15.1 - nfsd: Make nfsrv_getstate() validate the stateid type List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 2b58bfa572451dd9e92f8be8f40084758933143d Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:09 +0000 Message-Id: <6afc89f9.98d.13e647a2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2b58bfa572451dd9e92f8be8f40084758933143d commit 2b58bfa572451dd9e92f8be8f40084758933143d Author: Rick Macklem AuthorDate: 2026-11-12 17:19:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:21:09 +0000 nfsd: Make nfsrv_getstate() validate the stateid type Otherwise nfsrv_delegupdate() can be tricked by a client into freeing a state when it shouldn't, resulting in a use-after-free. Approved by: so Security: FreeBSD-SA-26:79.nfs Security: CVE-2026-101317 Reported by: H. P. Cook --- sys/fs/nfsserver/nfs_nfsdstate.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 845949b8f630..2bff27c7bd6f 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -1754,7 +1754,7 @@ nfsrv_freenfslockfile(struct nfslockfile *lfp) * This function looks up an nfsstate structure via stateid. */ static int -nfsrv_getstate(struct nfsclient *clp, nfsv4stateid_t *stateidp, __unused u_int32_t flags, +nfsrv_getstate(struct nfsclient *clp, nfsv4stateid_t *stateidp, u_int32_t flags, struct nfsstate **stpp) { struct nfsstate *stp; @@ -1772,7 +1772,8 @@ nfsrv_getstate(struct nfsclient *clp, nfsv4stateid_t *stateidp, __unused u_int32 /* * If no state id in list, return NFSERR_BADSTATEID. */ - if (stp == LIST_END(hp)) { + if (stp == LIST_END(hp) || (flags == NFSLCK_DELEGRETURN && + (stp->ls_flags & (NFSLCK_DELEGREAD | NFSLCK_DELEGWRITE)) == 0)) { error = NFSERR_BADSTATEID; goto out; } @@ -1959,8 +1960,7 @@ tryagain: /* * Look up the stateid */ - error = nfsrv_getstate(clp, &new_stp->ls_stateid, - new_stp->ls_flags, &stp); + error = nfsrv_getstate(clp, &new_stp->ls_stateid, 0, &stp); /* * do some sanity checks for an unconfirmed open or a * stateid that refers to the wrong file, for an open stateid @@ -3481,8 +3481,7 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid, error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL, (nfsquad_t)((u_quad_t)0), 0, nd, p); if (!error) - error = nfsrv_getstate(clp, &new_stp->ls_stateid, - new_stp->ls_flags, &stp); + error = nfsrv_getstate(clp, &new_stp->ls_stateid, 0, &stp); /* * Sanity check the open.