From nobody Thu Oct 30 01:21:32 2025 X-Original-To: dev-commits-src-branches@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 4cxmXr3BbFz6DRB3; Thu, 30 Oct 2025 01:21:32 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxmXr1vNyz3hWR; Thu, 30 Oct 2025 01:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761787292; 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=oEY+0beWLxLLsH4qYJlVWvHJ4CfrCA4w36vfIoizw/c=; b=mmBVzgPQKUWlUhPTxF3+Tv4JfReMEbGMGqnucP5tWkFGo182hJsyP5qtJAuIn8zwWMhBwi VBYSooyczZhXXdkl8pJBruXQdGtTKEHSLMcRI5FodBjW04mUushDnk39qClP+DLYso623V 548+pmZdldW8i3kzY+iKll5pFW//KDLdieKMhriYir7tc8ktKelNaJVDQNau2LIUVJcjTQ zNx9Q+7YynX+XA0S3HYE5UMs2QeFhqFKruOPwNR5YF4GAlKdkVCkub8Ry0sIEvsDx1t2hu KOYjHsgDShTPEr+A5006UEsyhpWGJblT8VTSud45AAzFix3Wi4kDUxwqJfx0Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761787292; 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=oEY+0beWLxLLsH4qYJlVWvHJ4CfrCA4w36vfIoizw/c=; b=NxxI3Saowj4cfgEk4VVB+z2jKTNyuGKffpn+LyU1EkX2kgFnxGNQMgBJj/QSmnfaj27wS/ KDnO7EO5F3zaQh7sNz7rUUZxVlOFyCq82ckStRa/I3VjfK7vceJTldX9jL74RfIILkE/Rx +5w3+n4Qn9KNV+d8fjb+y4FWyG3UAocGNXXvd+w5my3NfxAd4vX4VH2zeIl/T10k0Gk0nR ypOc5i648P21DzJBUqbynP7lYVI5gXiRDI0+Vf0mGWMUWwyWxTgRFstNS4t7QZh5sozdUC N/cTKWLYhZgotoxyXDEdH3aUaz3+QaCXBAhJgxMmjr2gF9y9f+tsTpt0taUqZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761787292; a=rsa-sha256; cv=none; b=BOC1EnV8WGr3PGba5ZbLERWU+8bmY6ZN0zBNztfdEGWwx3jBuxmBzdorWiR0Kks7pVsJS9 LDQhBqV8W3L41AYL8TG7OJ+U4PEIVc4XmwNf9MJGLrULVyATaT6SX0wUWcFUImFJnGf1Qp huiMB/CVyUdAjorhiXb+lvWu7r0Tq041vkR9dk/oeYRUbTbsSRt8xTuloxr4rAD59KeRNw KD7ur7qeNJgaUg5Aw2lahsMLnbp8V64Di24ZTZUrwJvXzeNgUhPS0je2a60zv5xxZQGmHF tQ7LcAwVeUn3nUrqfNsJ3AvJbNJm/RYHKoKReK5FfwJeeiKrrQEmcioC620/UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cxmXr1FTXz10l3; Thu, 30 Oct 2025 01:21:32 +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 59U1LWjF041569; Thu, 30 Oct 2025 01:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U1LWat041566; Thu, 30 Oct 2025 01:21:32 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:21:32 GMT Message-Id: <202510300121.59U1LWat041566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 7c9d801ed278 - stable/14 - nfs_nfsdserv.c: Add a sanity check for layout commit cnt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 7c9d801ed27885af0f96b89b8b44480ee9808ea5 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=7c9d801ed27885af0f96b89b8b44480ee9808ea5 commit 7c9d801ed27885af0f96b89b8b44480ee9808ea5 Author: Rick Macklem AuthorDate: 2025-10-27 14:24:47 +0000 Commit: Rick Macklem CommitDate: 2025-10-30 01:18:41 +0000 nfs_nfsdserv.c: Add a sanity check for layout commit cnt If a client were to send a LayoutCommit (seldom used and only for a pNFS server) with a bogus cnt, there could be problems with a malloc() call that uses it. This patch adds a sanity check for the cnt. Note that RFC8881 does not specify any upper bound on the cnt. (cherry picked from commit 1a679fb907962843f01b103ec672136a8f8d8edb) --- sys/fs/nfsserver/nfs_nfsdserv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 88ae643d193e..6047e6f2970e 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -4950,6 +4950,11 @@ nfsrvd_layoutcommit(struct nfsrv_descript *nd, __unused int isdgram, NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); layouttype = fxdr_unsigned(int, *tl++); maxcnt = fxdr_unsigned(int, *tl); + /* There is no limit in the RFC, so use 1000 as a sanity limit. */ + if (maxcnt < 0 || maxcnt > 1000) { + error = NFSERR_BADXDR; + goto nfsmout; + } if (maxcnt > 0) { layp = malloc(maxcnt + 1, M_TEMP, M_WAITOK); error = nfsrv_mtostr(nd, layp, maxcnt);