From nobody Wed Oct 22 13:01:16 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 4cs8Rw5j7fz6FFgm; Wed, 22 Oct 2025 13:01:16 +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 4cs8Rw237sz3pfc; Wed, 22 Oct 2025 13:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138076; 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=TPKh9w+ivQO0iGicrojntFJSDavKBKP/BVEsaNc6wB8=; b=X/Ou6Crfe1QyQQUc8009mpVssxvzGC5CnPbbqc4SosUDT7or4y4GTXALJ+c0e/tegHisPd dajuaINzP9txzOkDZw5ixTKdWk8Ij32Q1Wrfk7yX7c/xc/M9lAZd6yF+Tb3JWgL6PIoxjr Uf4nS+koHgkysJakVfuDujxiK4jlCp+d+oCSQXMnTJXl7b4esyVbVqYE5G5AOjmeiXtc2v ZCp27ZYj2MkZaFjVs5MCUOrX3noefSc6f7WXKULGiFD24LHbNbM2CTx2Yw2rBmOd0aIhL4 pVobfl6pLDrIHZueryjilsZ2U4xgGJso/FvdvCjblKcU+Lxbh0XFwPq2UOPzpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138076; 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=TPKh9w+ivQO0iGicrojntFJSDavKBKP/BVEsaNc6wB8=; b=hAOSE5ZUD6Wm0MYQX5z1erx+QhKPY7NChQBmoS7EQLFNXEgXc1BDOQ4Y95qGJvCAfCfJ7r lq3T0kmLkEwtQeu44fhWq4lHM1b0NhQpFXiYNBmoeup0rMlcLbkRMplf7ls6QwijP9Do/f ZC767s2aDWGOFnuM5EQThHXPS+fTyAS2m6p3wWrVvG+9brwwF2+9wsF3inmPnalOEHYkXq up3nXgan4eQAFhIDVYpgw70tbKwBVBpo5DyepM7rgv2PcNk9RVtY1fks3P6OfQGisiV6Us mngeEdZTNq8uoxKXn+GFKEaBxUdRzezvdnBGxjxoAeX+EowyGtU9y4k+EQALbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138076; a=rsa-sha256; cv=none; b=uR/FcXjEaSG6D2BmWgH7PaXW5rr9ZgVNZOKODoe3LKfskBfWGMjvonHQTPpI8C1H01U7S1 ni0JNs7eDVeKPHyDFitvQRvAic3mK/xc4DNiC/6jfQCa26DnnAQlAQY/avkwlFPVtYT9Lw fZyjDPmrRLppo4gpO8+F6ZNQnKATB91RxiG1mRkn2zbOFyw+/kWHgoXAlKL3PKuihMJgTH ymH+NGh89ueiLQjewEOEYc4ETz+m+MkVKtOI27NWc7GR3ApXqaNAg0ztQf5ktop2WwQDzF cagZvQWSK/r2DHvMUcG3ivjfFqjjpCVDut3l6cUVtAPI/VJ5dp/SjPdFZJPeqA== 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 4cs8Rw1g00zThQ; Wed, 22 Oct 2025 13:01:16 +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 59MD1Gi6009796; Wed, 22 Oct 2025 13:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD1Gc3009793; Wed, 22 Oct 2025 13:01:16 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:01:16 GMT Message-Id: <202510221301.59MD1Gc3009793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b951c7fd7799 - stable/14 - libnv: Fix a length check in nvpair_unpack_string_array() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b951c7fd7799710141cde2066f2ed4d36e093a22 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b951c7fd7799710141cde2066f2ed4d36e093a22 commit b951c7fd7799710141cde2066f2ed4d36e093a22 Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:33:44 +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. Reported by: Ilja van Sprundel Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53069 (cherry picked from commit 937693fc9e4ff4045cc674a14902f0d53e84ec98) --- 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 a977d7941aa3..f6686a66affa 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -986,13 +986,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); }