From nobody Thu Oct 30 01:00:56 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 4cxm542M2pz6DP2k; Thu, 30 Oct 2025 01:00:56 +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 4cxm541ny3z3b7C; Thu, 30 Oct 2025 01:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786056; 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=mvtV49Znf+NWo2ZVbjWlhNGGuTGgLDHEFkyh/WUhvOs=; b=B/2M0A7ktKe0Ix0ycAH19w6lJPgKKwGL2JkmUU1jKF4wyThVSSm90bDYAZeUhpdJW3FhUT 8YwfyTNFOzqNlEwt+/YPHkvWAp/1TrS0GMSftX5a/VrNdKjyFcpAlgBvQwFL1lHrrvBKyp PRm4YKJiVbKdTIHgGfkT3srvGAI7iwCK9KlTUXCbxJgbeuuJFx31ZgqpAf5aY1bQQMxQcs 34PbZf0Hi2kmdaZBWuBi+KUYuLiAN7MoZtyjxQVjrVu74pFfZj0EdsdIPQFFE8at4h27Gs jbzNsCRGl94d/TPkIY5q0ydFkmZIKGA1znk5TMjt+Io5WIsfAtcrdYTE9EmNQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761786056; 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=mvtV49Znf+NWo2ZVbjWlhNGGuTGgLDHEFkyh/WUhvOs=; b=JrOZo6vbdW5xNjKmmAf5TbnyeyfEeI2QVLo6kV0NTX2g0+EgtcOXgZrJEI/NJWCfm3TWBN LUSsmzVDwkMJa3kMSZbqersQpW1F26NVAXP0wY7Ix6HWXqvOtqexDzXF9oFRAENrOUyWDC Qv0C0uZYyE1amvGBV/oveunhYR7GqVrNbFmOp2W/doZ0FZeNvYo55GCKa2Y86CaYLTQRmG Qp6IigMlsUqBdhoBoAz8tDyDoatlg62shNmgfgQkGvUMXxXZQfv3r8T4ToBJluOKo8e0LA fzBM1RzVa2PV/7FnXzzTnNjfdjoANX3mo1kwXuS9TXKxmBJIHL/cRKcEr5/4/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761786056; a=rsa-sha256; cv=none; b=QGoXpWxl1lI6x5ZWWi9LCxcXEyECUZ6s86vtEKvSXAl5iloB7GW4LoW12pKCPcgVaNIsCX cLqqfNKJOV51gQXcL1Pk8HMslQPKOq0GWXvkKu6FzuyHcU8HlO2rGyaClQQjDAxwwwmOBq 4di+qjCVhr1QR0mGHLntL25ZaRpNvZiXByjFN2d9oYZ1HHxqZCnk8x0Ql0n5AB9P9U0e3J FQRqIBtvmSPT57RL3mDUEkRvc8Rh1JkmRmx29BkRKYT8hOOc8was/zcZ5IzjjdoHm98rWl TJ/U3SZMZWEKKyOTHBjYUJyehfipGmmGD0PCUKCx8eInI4Q8Ygp/x+tBGK4Aqg== 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 4cxm541N0Kz10lt; Thu, 30 Oct 2025 01:00:56 +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 59U10uaJ001278; Thu, 30 Oct 2025 01:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U10uvN001275; Thu, 30 Oct 2025 01:00:56 GMT (envelope-from git) Date: Thu, 30 Oct 2025 01:00:56 GMT Message-Id: <202510300100.59U10uvN001275@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: c69e0be70f46 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c69e0be70f4693940873f16e5019bd229a410369 Auto-Submitted: auto-generated The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=c69e0be70f4693940873f16e5019bd229a410369 commit c69e0be70f4693940873f16e5019bd229a410369 Author: Rick Macklem AuthorDate: 2025-10-27 14:24:47 +0000 Commit: Rick Macklem CommitDate: 2025-10-30 00:57:59 +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 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);