From nobody Wed Oct 22 12:52:38 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 4cs8Fy6hC8z6FDg5; Wed, 22 Oct 2025 12:52:38 +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 4cs8Fy5YSRz3mr3; Wed, 22 Oct 2025 12:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137558; 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=QtAGSMD3Fn5NhL23rcQ+akC8w2uoVHj1fIarn3u65iY=; b=TEiVLnVjjO7Ap16W4TmCIOHP4RYdqH3uogG6AaT2xgdC7ZSnMGQkbjysgpTmEc7vN4IxUL /LMmysTXka4eT/Zop7m2QJQFUVuNC4YIVCoebL9SISk4HKnZVB+Eic6AVPw8Gj/mYsrPB/ hLq/Fv6xZdZDDq5Jt7KkdWeBriHVAgJyT/9gEbyusS142yUKEZH/Ow0wacDMooBoPmlCJC 1gRydCRneDE7f6CgAtTvQ28Tk32MMly3W87D5VNx/5zR52qU83ZlS5lIC7var6ztnlggKB vcUfIFe573PXx34msEK7pOoAw2gVH61EI5tVdtj42EGeyXX7YlQA2sFFle7iSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761137558; 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=QtAGSMD3Fn5NhL23rcQ+akC8w2uoVHj1fIarn3u65iY=; b=hyW8r9F8bYUAostiAHGDg/RHzGWESLOb9/e8IDHe2zTdZAQCEzUZz+gffVsE4Retb1B/VK 9duqJKSdWog10yqg1iFnrqwUz6Db3ORU6QOGzIW9kJ7SmUGEPHb72d79UOM9tZTvNKErSh k5R+gl4jHfVwmM2pXfeJT6+nR1eXYSwnCMVM1YtZbiJ8IOixTXkZfsIGRAJQSNUxXr1v45 +up8oqsvt6Q3xvUYkfpx8W2OGJ8A8r2ucZrRN17ayY3xAp0PGr3Flq7z4d8x5XQnDHCS57 7Bbmjl7xPpfCuT8Y33D/W4qVCVTojwBzsVZa65ye3s7ngJu+VuSqAsenEtHsXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761137558; a=rsa-sha256; cv=none; b=FV9OQp2CTyWwRgA9mcLxkMaTmNkrhp2AhvQW6lJTActhJqcV0if9T+CSPwgS4s9nZ/ogHY LAg4t67gxm7Cp1bSU3vYXMStKgth201mVYzX0bYXG/tn87TJlnISWotsqOCqPg5bbuHeEC PUPfTug3pC1sbWRGsoTg9Y1NhrMwsdDBtfLvRsxchvC+FSz0tg4DCDFzV+5SeeXrsGd8k+ v7BQ2S7TL2Zs97epQuoo0JkOpOeMAn98nA/ObkAM6d6oRjj9lEQ33naDBxbZjyerkkL0X8 MG5talJfbvMi31Elh4JxCWr8sNfSTKG7ub0iSyC2u7NwNq7CrR9ab6iPYhyvuQ== 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 4cs8Fy4t1JzTh6; Wed, 22 Oct 2025 12:52:38 +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 59MCqcQf096170; Wed, 22 Oct 2025 12:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59MCqc6l096167; Wed, 22 Oct 2025 12:52:38 GMT (envelope-from git) Date: Wed, 22 Oct 2025 12:52:38 GMT Message-Id: <202510221252.59MCqc6l096167@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: c47f9af4771b - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c commit c47f9af4771bc7de2ebed4c91628c1f9a7f86a2c Author: Mark Johnston AuthorDate: 2025-10-15 20:15:08 +0000 Commit: Mark Johnston CommitDate: 2025-10-22 12:51:59 +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 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); }