From nobody Wed Sep 4 12:24:12 2024 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 4WzM9m5qhXz5Tnkc; Wed, 04 Sep 2024 12:24:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzM9m3Skwz566B; Wed, 4 Sep 2024 12:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725452652; 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=zS9B1s0B6jngtIpTbOq1ktIsexmx5zqdGNojm7k26VE=; b=xXUN/bEWN395vkkzD0bqwSn1q+pArgPxaYH5Q5scZffqvjqmAIxCWvFZeJChJlrMh265JK vbTdb3MItIpXh2lvQSlK4wl8vPJmcgTIgsOtVvGzNOhjd7moaOs0TFOfAurO4XqpLrj1Vc pKw3PYlsm2uV1JmgfbnT8ivtfQkVUff/2PVZwW/M5CMvDdRJfMg1JoXPhV3tHl4CyCBBJQ mrtN4yS40uKEWaMHql3O1xacaiznL5fgA5Q/PbjJbVzUwPzq4LcFIWoQ3OPipMfDxtGBF/ hm8VbShRzXSj6//6pxdg6PcORwRS8LvBprJfjj3Ldejd5VUCzFJOCwHN8wln4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725452652; a=rsa-sha256; cv=none; b=P4Fpcl6HM/7PtsCz/uu1rZeFsQLeL0OcnL2tdEXqtri1wKp5//IeQyHoHaUhR739gxp5Wi dlKWywsKTIeZ+EubSb+O5U/GmaNLQfvYZ4RfoAnpSNPYolSr4S4tZdZhQR1ou28gLEsDPX BQE/xPoIByu5qo5V04lHWQMrqSyCHweZAwYy/Cjn8TFAzwZjFUjBHVMF0eLPYf642ogxQu 4JhrfmSVIzqCPiJ+Km+PIgTKfXrvEfXes9my8qMHyR5h+QbfnbmiXSJ/IW8PfItbYC8+4p NXbGGDAWMmkkxm/5sHOTkL1XE/hnkZaNV45xKMUg4lLobeVGEPyfGdeo0E+U+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725452652; 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=zS9B1s0B6jngtIpTbOq1ktIsexmx5zqdGNojm7k26VE=; b=acFy2XitYNpaw4s2iUOelOlTpY3tVFeaeC232dRl0tIe11vYnVj11cgzaIdbHd2JAltOwR lteEervDrtgUZeWlQLi2+rHpLFSSjKs9DDxczMUPtYN1qZzeYKtfdl3/49RLXRLZu5kDMK r5BXBhWcn/FI7z9S50GaYCQ/bbNkUcgZPfdb2xzEDJsSSkx2ogJh13egDLKvii7fLYAWuR wmNNN7MKEfGcnFgALhwSy6zPF/MfSD/SeUzv0nz+W3EMKNEPUsDiVtE6cL+daWaUt16jo5 mIMQv2lVXpZah9nDIT8CLhRDdO9pfgnokhwVLDYq/Pys4OutbYysxn5vc1US/g== 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 4WzM9m2RyRzPDS; Wed, 4 Sep 2024 12:24:12 +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 484COCCl062286; Wed, 4 Sep 2024 12:24:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484COCsl062283; Wed, 4 Sep 2024 12:24:12 GMT (envelope-from git) Date: Wed, 4 Sep 2024 12:24:12 GMT Message-Id: <202409041224.484COCsl062283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 03bef9971d73 - stable/13 - libnv: verify that string is null terminated 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 03bef9971d73621e1703a0bad41b598bc2fce9c6 Auto-Submitted: auto-generated The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=03bef9971d73621e1703a0bad41b598bc2fce9c6 commit 03bef9971d73621e1703a0bad41b598bc2fce9c6 Author: Mariusz Zaborski AuthorDate: 2024-08-26 18:20:24 +0000 Commit: Mariusz Zaborski CommitDate: 2024-09-04 12:25:13 +0000 libnv: verify that string is null terminated During unpacking, we ensure that we do not read beyond the declared size. However, unpack uses a function that copies null-terminated strings. Prior to this commit, if the last string was not null-terminated, it could result in copying data into a buffer smaller than the allocated size. Security: FreeBSD-24:09.libnv Security: CVE-2024-45288 Security: CAP-03 Reported by: Synacktiv Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46138 (cherry picked from commit 3aaaca1b51ad844ef9e9b3d945217ab3dd189bae) --- sys/contrib/libnv/bsd_nvpair.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c index 41d262a18c9b..cfe168c38026 100644 --- a/sys/contrib/libnv/bsd_nvpair.c +++ b/sys/contrib/libnv/bsd_nvpair.c @@ -986,6 +986,10 @@ nvpair_unpack_string_array(bool isbe __unused, nvpair_t *nvp, for (ii = 0; ii < nvp->nvp_nitems; ii++) { len = strnlen(tmp, size - 1) + 1; size -= len; + if (tmp[len - 1] != '\0') { + ERRNO_SET(EINVAL); + return (NULL); + } if (size < 0) { ERRNO_SET(EINVAL); return (NULL);