From nobody Wed Oct 22 20:15:26 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 4csL4t3pk0z6DJ1J; Wed, 22 Oct 2025 20:15:26 +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 4csL4t1bYXz4JBY; Wed, 22 Oct 2025 20:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164126; 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=eg/2lPMcOk8W/K4vj5QO+A1Ilfo0/FLwtA7+Lm9bTE4=; b=HpFLk+UyRh1x9anZoYWs0f54WuwVygi0P9d37WeFQK3trKHajXjWdLHA6LG3rnmrk7DgBr fyLvv7+m9C3IwDFZ/P1i8WMHJBWQyVlmyagk1aBHSalM1+riR3sSxlI5dw1LUH/dHy/xnN BJlajLkzocC8UwivS+i7ajhcCHo5TgV4f6OWFFRECFNq5rnd24dp68rEpI0MEiy9soW0Cf NQgojSgmXsK+9cqnixHCZvABfqiO1YS55baAt3j9C19/vWv6WIl15e2CARgdlrUwHuCN2o yWW/dqlLW6USQaa5LfuoKvoFG8WJ0iSdDEe+Yo6ElG/wKdx5aDZxBNFJhtaggQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761164126; 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=eg/2lPMcOk8W/K4vj5QO+A1Ilfo0/FLwtA7+Lm9bTE4=; b=b4Awhmh9vQgkLKzxihMFg2aqwMVjqRAzK2T8uz9qDWPgjV1ZBEKxw1dwy+ajPEoeYApcum 9q8+xmPAPp9GvpYd3VzCus9iKtubwLCuT/pwEKacBE2Sj4ZRYP061Rpvzp/W+m2qOzGGqP O2VtNgpnYq4IjHEUPv4dh6I0FmoR+TnVr4n1CMDcWCrtftsxeHGN1hJXCrOgckZO3nPQdx Eg9ZVwgRhL4EQ0BjqiGvFqIh+hpiaWJ9hZEW8OIH12Ft3dNnyXx+5LnlHUPqqwTWa88+bo B1egkIZ2VasRKZ1PXIaXkpIeYkKJPSHdIPEpVmfDIbOCLLQtVBgbi7NawV1Y9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761164126; a=rsa-sha256; cv=none; b=nBpn0KgqICC32NGFiZqdkHCZOv/BMmvEq8d8Gqh27E5ABEfX7s9ET+NTI94xXuMP/HjkYe 7AXMAcVDefHh0Agnc/yFc48SxupKD30PeJijF/j3LmFAvDafkgF0LfQA+MoBdcq68vOk5w iDgveu4FxKj0JU0vMg5todmuTseAToNFzi+lWtpLxQDGDmin1GzX+gs6zE8wi06n/SPVdC SlUos/FPrdpnOVq27+NcMRN5hlF5zR/4uuWcd+nx72WmC2CVDfa03RjXjk6S9ki9WtBiw/ e3yYDbN3Oa5XI4uz2lEvCkSDk4eopGelBLdhnUq872rGqdzkdD19x3sBPFHIQA== 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 4csL4t0zl7zl49; Wed, 22 Oct 2025 20:15:26 +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 59MKFQQt033081; Wed, 22 Oct 2025 20:15:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MKFQ0k033078; Wed, 22 Oct 2025 20:15:26 GMT (envelope-from git) Date: Wed, 22 Oct 2025 20:15:26 GMT Message-Id: <202510222015.59MKFQ0k033078@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: 95f60a34dd1a - releng/15.0 - libnv: Fix a length check in nvpair_unpack_string_array() 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 95f60a34dd1a0518368154150b18d1063d4c5cce Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=95f60a34dd1a0518368154150b18d1063d4c5cce commit 95f60a34dd1a0518368154150b18d1063d4c5cce Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Colin Percival CommitDate: 2025-10-22 20:12:23 +0000 libnv: Fix a length check in nvpair_unpack_string_array() A string array is represented by a set of nul-terminated strings concatenated together. For each string, we check to see if there's a nul terminator at the end, taking care to avoid going past the end of the buffer. However, the code fails to handle the possibility that size == 0 at the end of an iteration, leading to underflow. Fix the length check. Approved by: re (cperciva) Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 (cherry picked from commit 937693fc9e4ff4045cc674a14902f0d53e84ec98) (cherry picked from commit c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c) --- sys/contrib/libnv/bsd_nvpair.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index c73bc2189121..b884dd260b84 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -985,13 +985,13 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, size = nvp->nvp_datasize; tmp = (const char *)ptr; for (ii = 0; ii < nvp->nvp_nitems; ii++) { - len = strnlen(tmp, size - 1) + 1; - size -= len; - if (tmp[len - 1] != '\0') { + if (size <= 0) { ERRNO_SET(EINVAL); return (NULL); } - if (size < 0) { + len = strnlen(tmp, size - 1) + 1; + size -= len; + if (tmp[len - 1] != '\0') { ERRNO_SET(EINVAL); return (NULL); }