From nobody Mon Oct 27 14:27:55 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 4cwG7b3kdTz6DkNK; Mon, 27 Oct 2025 14:27:55 +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 4cwG7b2vZXz3f5v; Mon, 27 Oct 2025 14:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575275; 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=v2ADnp/qyjgkXmT2pqjTJ/3k64nQOBwZC+WJlitpqVM=; b=oWfyt/Y+xsvQyj+eYEB+GXsfKKKRKhFYAvudC/sJuiz0GtXyA4UJd3v9OYfJHg2e/f/bq4 R3Wl2059tafp0mt1abh27fj5uUT1X8Cizi8Z731H4P951mDPjZNUFwPyLMZyLEWqyFsu/8 ly/w1JPzzdeub1VnGfzSX/uENPv38YbO4DACNUsTu6GUNtmlzo2slCjANKOd5LIFujOiT8 ainSwUv+ftPRsfLXKmGwZkwu6LexFgh3TT16bz7ex5JxtHmAGTb+nMZqK5SNDN9qa+1OCP 37Y+IMXeGDpddYw7MOegY8aTZbfjRArb7jbXbU9jJ0u+M3iVKnyGEbXB302K/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761575275; 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=v2ADnp/qyjgkXmT2pqjTJ/3k64nQOBwZC+WJlitpqVM=; b=ijAcmxPDld0bTDhqQYIZtio60GF1Dmu67R7dk09r5q7XWLLIq6oWTqGAcA3lYQX2Jp2Cz1 g4AwMZx+VjvheCiu2D5+cve8WrVYvxoItBVEA13OSyz8iiK8MsDmUGrAq21KXhh2uE7OGA /pvfvboSPfE4jrjhOJFR3AN6c1nxA18NhY4rpJW3GC13IkbsSITCHHXByJCXwd0sU1I12b 16tCr1nAbrI/dsOASHGC6tVDDgm+4vTcIvTJIB9vOHDG3YuF54AxaJpleivKZStaca+REO 97tUbugI1Sh7H6VaHpikyE7DI/IeGmIf6sQTFO5cbeZBQCZGFP+lpn6/3d547Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761575275; a=rsa-sha256; cv=none; b=MgF56Uo89EptUCKnXcLDlDEzELuAKH0d4vKgVmOJnmtADT17K2XbsNzJQ2i2cLRM9Y4LN6 qI5SuvRQTdTrYGh16NckJK8BHoLkJtcsu+bAKJBSt0Jf34zz+DNBVRT+1dzG3DN8onVYXN xFl+EQ4PfGzSZVT7/v7RIS6A6aTh/a+G829j67csxCOgM4OBkwxExIk2GJYrEX9S30pjwc DeYeuaBwi7xCXWivECROyjmVFdUEysfj49wd6JE8kg523f2L/tgAGo9YWvYGwlmSZQPn4r rhGRQx1Rwm4FqESZ0C3+UvR1T1LXk2pEtWv6TREjhN1dTkSW9nrWxokSZfw1Gw== 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 4cwG7b2VMlz1Ltp; Mon, 27 Oct 2025 14:27:55 +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 59RERtfk044212; Mon, 27 Oct 2025 14:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RERtaZ044209; Mon, 27 Oct 2025 14:27:55 GMT (envelope-from git) Date: Mon, 27 Oct 2025 14:27:55 GMT Message-Id: <202510271427.59RERtaZ044209@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: 1a679fb90796 - main - nfs_nfsdserv.c: Add a sanity check for layout commit cnt 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: 1a679fb907962843f01b103ec672136a8f8d8edb Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1a679fb907962843f01b103ec672136a8f8d8edb commit 1a679fb907962843f01b103ec672136a8f8d8edb Author: Rick Macklem AuthorDate: 2025-10-27 14:24:47 +0000 Commit: Rick Macklem CommitDate: 2025-10-27 14:24:47 +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. Reported by: Ilja Van Sprundel Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53354 --- 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 6f3447f26620..67af0cf71175 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -5138,6 +5138,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);