From nobody Tue Nov 17 17:05:53 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 4jTWMj3wCsz71Rqk for ; Tue, 17 Nov 2026 17:05:53 +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 4jTWMj1nQXz4JB1 for ; Tue, 17 Nov 2026 17:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935153; 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=acmKtXpmJTsJ1om98O7aoayqRp/2WOo3Y1BMDXLHaGw=; b=gE4i5pBp3p96VpxkzIZ+Rty3OAn5h+McP0BhQ8psT9jca3CagqIU5KnxLx9me6iXJeH3Td x1hg9ltOLp27reck56DrNMuHelGCj6ybeyHkP9qRnNffUIod46JX0XA5ZQWp6f8xrWOQm5 S4Nl4QJUHlEuWk0AfAKZLWdduw2w8u1pd2IxruMfeYpB0AKCGRYIoLjWdBkyAaiZWiPGEx ZPQdc49ai/5SxLkKm9lrb/G7srGCnO7nUpbtk6aP4iwJWNUHA66NJ8yZ+L2UjwR5NmHDVo yvOxramyQFW+cvU1UIsn92lw/ymOGDndNNbLiRq1YK1ZN53uXG/lhfQIaHuYaA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935153; b=Sz7DNFXycceA4HjOQzFRt1gUmD9W0LewG9TnA6fpTIDRzcM2n4N4y2+C8EPLmPJflSdKEa 5bf4nwzAAGLBq3A7AFFephObR4TjgPodMHxS81bH/Z6OvuSLxfRrSsHlG6XwB53DAxGlTY +E8d3ttMPhiLspkb3FNyFJsS6PKqYwnbVFX6qTVoQWtpXdL5J4Nkyrw0lqF8L27U2f3EzS yM7OScZ9AB1P7/cSs1dGsQ0UOXSummUt4E3osPMDpTcWtRtEhgfrX4wYYtQ2mR0IZ0I8rG jvN0+2DVdb3283HKnvL2X97Eq9FHOiYFqwm/FVL9/fW/LHU8OEZois2ho7rRvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935153; 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=acmKtXpmJTsJ1om98O7aoayqRp/2WOo3Y1BMDXLHaGw=; b=EWRdzhRA42EL57JCREsNBFCLsG9Abt/SD6EZVg+s+0o1rBt7VHtDSxNdOE1R0/FLTNl1xP XS9qGgHvFh/CSSmaNe55yxpG7bERpYxxTZftQtJPHbHUA6jRJ+w+oOl8xcl9F6Lld3YFDX sWRwdnZqh+IRNnN6liIHxqjkKDqcmDOZGZp9lZHPbqKCz6IuuMUOU2zPcu58DgWIeIdpcH QHCyIQjgfosl+F2KBigtjCFIVkGfh6hjgSb8RpWZGZ0j+KYZS/3GnJE1saYMq1gNnhs/Yf XxkIfZS6NbZLm+/yESCxc0TJplsCco6cEWh6Zi757Wtoup2s+P5AdGL8gZvusw== 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 4jTWMj1Ps5zrmP for ; Tue, 17 Nov 2026 17:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e0db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:05:53 +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: d1ffacacaad3 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: d1ffacacaad37a128dd6ad324a0b1348b2436392 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:05:53 +0000 Message-Id: <6afc8971.1e0db.d0ac17f@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ffacacaad37a128dd6ad324a0b1348b2436392 commit d1ffacacaad37a128dd6ad324a0b1348b2436392 Author: Rick Macklem AuthorDate: 2026-11-12 17:19:03 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:22 +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 320e690724fa..90c6a3b53e57 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -1743,7 +1743,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; @@ -1761,7 +1761,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; } @@ -1948,8 +1949,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 @@ -3482,8 +3482,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.