From nobody Mon Nov 03 20:29:39 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 4d0jqm5lGqz6FjDv; Mon, 03 Nov 2025 20:29:40 +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 4d0jqm10Lcz3KYn; Mon, 03 Nov 2025 20:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201780; 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=PZccrlAs6n2MUsBziEeMNB5aa+3KGqLdiIEYeLNTnlY=; b=CZFL3XrF8VUV1wEF3eYmbvCjJboNQq05OHPhibYagFE2e3tr1VgI89uPIzJRnPVIPN0V43 l6B3JQXhfr985SalrG37SulXsTrnxeMJYuxNxcx8BB/QxIHa/wDwiLenZnfZN3JRDPjMOR 74u7APxEQLQHhygYDWlhOxQ2XOseutjuyeaCW6ooDQKmGV7br7I/VPb0AycLzMLWklAzem dSeG0a4j6kIkbD3vL/ClEgh1QmT+9UNGdm0sRwgqXR4PKwKj84pp5d8QqFJBQJF+T6p2Ao Ljk9iZVvuHFUtSxjcIuWX/zwbad1Td0r0ka0angsshsbpx+AtdRM7UKOCgIKRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762201780; 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=PZccrlAs6n2MUsBziEeMNB5aa+3KGqLdiIEYeLNTnlY=; b=hhaCkF4VIsDVGaO6I5+YsJwLnOdPe1F1TeYV4XMpLgVpeEW3htqsWidnD6bpPHEXiTiBN0 tZrSvlqtXkR3wcznk0qS0jj16ST/qAhLz7Kf/yTos0kWxd6kkbfpt+hBuweaTmNAdhgwg2 civGCZNWYes4XHifXJQP1UFonIsJErn6BmsYlbnrBq9DoBtGQhYbzailMY1aXJs0gRwXWn orAtFDf58u7o9THpi7MaHCoIkLNFlTZS7egz+mPsE2hUcs/2TW9sWgKmRh0m42WYqmou6j jHor9c0Dg3UtSqxF/9hN5QBhVnBZs2geHMqtabDuE5F0IZ4Ql0HyVWo6DjaDrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762201780; a=rsa-sha256; cv=none; b=upbRRhadx9kW4/urrNlskWx3ma/ZPwgKiRazOBfgZZHQL836p26S3e4l3GUbpHjEDN+ZsQ lTDPm0BzTHQ73cbAwnY5XktV8QrzTXKgO7Fnj40kZHk5WEyvBu0Qf//Gdy/bW9sD0lJNXU FsBwKaFL58iBcpdQiEWEq4LBxK5Hi4t4QWoV5tLtoVYpwggg6PSt3gZiSPtVuT2JBuxjSm IcbuQ3F1laOo09aNfOTyWO9mrzZ1qNMN4GvwVVxaBzFyYLJc5gxEifWvAZzUddh7dH/L9e WgzyP66vChukafELDfaVF6zdrpZftht4w16AFQBoFISDevsLwy9m4JmMsCLdLA== 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 4d0jqm0Z9Fz9j7; Mon, 03 Nov 2025 20:29:40 +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 5A3KTdp6050915; Mon, 3 Nov 2025 20:29:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3KTd0x050912; Mon, 3 Nov 2025 20:29:39 GMT (envelope-from git) Date: Mon, 3 Nov 2025 20:29:39 GMT Message-Id: <202511032029.5A3KTd0x050912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f38a2cfd5f24 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f38a2cfd5f24dc815ae4a4a5778db05b403cd8ff Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f38a2cfd5f24dc815ae4a4a5778db05b403cd8ff commit f38a2cfd5f24dc815ae4a4a5778db05b403cd8ff Author: Rick Macklem AuthorDate: 2025-10-27 14:24:47 +0000 Commit: Colin Percival CommitDate: 2025-11-03 20:28: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. Approved by: re (cperciva) (cherry picked from commit 1a679fb907962843f01b103ec672136a8f8d8edb) (cherry picked from commit c69e0be70f4693940873f16e5019bd229a410369) --- 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 a881968b03be..9dda65d5cbcf 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -5128,6 +5128,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);