From nobody Wed Oct 22 13:02:01 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 4cs8Sn3MMjz6FFkC; Wed, 22 Oct 2025 13:02:01 +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 4cs8Sn2fDCz3r1N; Wed, 22 Oct 2025 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138121; 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=djgK8BwR6Sb5zAoaXEkXANhEKiz+L9XJJeD/qEaCc0w=; b=A+8xSlW8g2W8iZsrVkfh2BVDOs7LuLB33m3fpJ8dlZYbLoJ5xQtVEeYnZ2m7MzqDcE6WZN ro7nNCwUPgGyuis1Ux3U4N28PdFlZuW99iiq+xiE7NYBEpI0UfskPrTUZyNhcCkJLV4vD7 SFC0rsjdWeF2fvnBkTQxUGEaTpkXeXH41EBIf2FGO41H/J6ffcOiwoARWYVfpYG1hWvk7g KsVwtvIHNWBb9j+2aeHqjjVWcyqSjfliEWbcCkax8Jn1ue6WNWs2R94IecE0qKNTS5kl+H UAZLYjE1zcjnhhiavKSME5Uy3eIoPd0/MW3AizFOwIdgGX2iZq9HUi4tn7AW1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761138121; 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=djgK8BwR6Sb5zAoaXEkXANhEKiz+L9XJJeD/qEaCc0w=; b=A837Z9icUddFTFnvc2O2SBNU322Fh0nexlYOwDPlOJwdfAxfOJoinD75u2sPrWmjH/8PXO b0lE9KmP+b3/IFN0TKlu0RBDDnSQsrIvTkxzB9DJFRY3ZyOvhQpEgZNj/yRXj4injFBNL6 /uKhcD9VbFT5apDf33cjrP9zVwkFp8vZZX2nfrEG568F4JMJlD3raqWjjvVha6e75XwtLq jH1xcNWiGgOHSyKRZpj2Jn0cGLWtl+uTRy+QCJJsNd2Df5yuZkJevyhwfelLnbnpDqo9wj Kv53YbPjbVY/KuvoesUWOZ4qTZdpRsfkeYwgT9duQFfSBQ163W+8qgrQrt7ExA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761138121; a=rsa-sha256; cv=none; b=OfVDl0oFtRe5l+3/8lokhK/mN0U2qw4QmUdTT4R6mcq+XJlbqTbbWKZdFvi0H3gUhlcQHM o+zJ7pFE+7HJ8/edAzmNqLNkUdE6q4J0eb0AkdOxOGHqHllVobWGjWZLg34Q85XOaaNuaX iGyMwsa3EhGLV3hp2vFqkCMM5UeUnjVe7teXRHbdrY5RpRq6SzL+7vFqdg8rThb5fifu37 EQ0khAnJ+49nzJZ7lzNKK/JolJyIoWC5cIVxzqFAhY046KlC58IUKNnXiINRcDngQwzEjt zQ2NGVedzXN1YgmC39MUylcrO8aiLckg+w8eBPU85dZFS8ZBy8wj4Tdsat8zmg== 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 4cs8Sn21fnzVTY; Wed, 22 Oct 2025 13:02:01 +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 59MD21KD011324; Wed, 22 Oct 2025 13:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MD215q011321; Wed, 22 Oct 2025 13:02:01 GMT (envelope-from git) Date: Wed, 22 Oct 2025 13:02:01 GMT Message-Id: <202510221302.59MD215q011321@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: 43bf0f4cd2c8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a commit 43bf0f4cd2c81c2ffc72bf69e895dfcc9f03e32a Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:33:48 +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 cfe168c38026..826b1c35cd26 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -984,13 +984,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); }