From nobody Tue Sep 30 15:37:35 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 4cbhyS31hwz69FJB; Tue, 30 Sep 2025 15:37:36 +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 4cbhyS05b6z3VZJ; Tue, 30 Sep 2025 15:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246656; 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=W/Gvh5N6AKe7pPM11PqGhg81KA8HhNQpCpxJCwVb01g=; b=cIRuFaYrz9sGQ2NnL6D1lOcXRx6SykDv/gWnaQCUuD/rlh8tsrKfJ7cueytske4dUIpWNv Rl2oHnHiCqWkDCE91yjyy3bARnAeR0qafzScItQTFL7NFSNWQEyysAOXKTP5peR97ymnVR 7nM5j4mUf3jA7Hz1L/P/CgcV8OXP35N/ItzS/JQwTaLQk+NIRsilYqb0rbYMYRRkJpYG7z 0N+K3aEvROrg1k6G06DzAeOJM+JJIszAgz0ZHqdm3wSXBY3dJZzP+wbv7Z5Il0NCUAx/oY 3Ot2qFOx1BGDmg6bCuTGL4y1/wJ7Rm7+RyQ0mFV3UiNoP6jSojGkAP3YFJRFXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246656; 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=W/Gvh5N6AKe7pPM11PqGhg81KA8HhNQpCpxJCwVb01g=; b=BxkQI3B+WEFjy5iFYIIVZKMAzZhjO0STp2FB36IUmENQe5NGM6KpnBMf5w9TmEAmfNUG9x t8QmvJjb/QCokgeB0I4hZvFy325+ib1f9FNVYyh5gcpObT+Vo76uejPZY+zZKKEkvMmXfy u9Id7KHki/j1V/jF4Z5pXw9xKIYFE9nMZSERndE/PoaTxRXYQp9zQafwZM57MGnIbSSKQS Ph/07pbTc9e7fHuGunzsDTxkMOtxxd4w9StOX3vYi7MjnFV1ziBE2zKayDLp+fHO/XmeoU L1FcLer6J48iUApmHrDLkrRZPlRXqRHQeSb3NFJ1LuSz1zYv8oIbdPK9cspeug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759246656; a=rsa-sha256; cv=none; b=ZE1DB21NWqwr3umPXWmKZEr1mBI2itG0V9DXX3h+SZooGpPp0U1xFXmJXYBt0AwBK/G/Ph sAi4lvzYc/vHoVU5oqASlTXfss8Wzxg1ooYL7ck+bTmm76NddwlBs9qnAafxkzyUc4EXKv 9Cjcy6FzVbtS2s3v4Xvbqj+F7ZJ80UYFL9JFEs/LnFK0usQA0GEArhVPkbozA7bztuex+U 79yKCX7pdLehXaBw9GWh88zbYjuzQTnehCTbILpne1r+SgpxYMqrq5eAyus5sH+bayhNPK O4JJmZChsMQZhGmuwNacy2latHkocw4xNLvWHZqGSI/D5xdNuOGvtpThQw0Fdg== 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 4cbhyR6q1QzjkP; Tue, 30 Sep 2025 15:37:35 +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 58UFbZHA068045; Tue, 30 Sep 2025 15:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFbZTL068040; Tue, 30 Sep 2025 15:37:35 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:37:35 GMT Message-Id: <202509301537.58UFbZTL068040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: ae7c74cfa531 - releng/13.5 - Fix issue from OpenSSL. 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: ae7c74cfa5315e590cf7ef6fe8fe5e72330597e9 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=ae7c74cfa5315e590cf7ef6fe8fe5e72330597e9 commit ae7c74cfa5315e590cf7ef6fe8fe5e72330597e9 Author: Gordon Tetlow AuthorDate: 2025-09-30 15:28:59 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-30 15:32:35 +0000 Fix issue from OpenSSL. Out-of-bounds read & write in RFC 3211 KEK Unwrap (CVE-2025-9230) Obtained from: OpenSSL Approved by: so Security: FreeBSD-SA-25:08.openssl Security: CVE-2025-9230 (cherry picked from commit c0dbaf2b5dbd16c113a6346ee748fd474fe192e5) --- crypto/openssl/crypto/cms/cms_pwri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssl/crypto/cms/cms_pwri.c b/crypto/openssl/crypto/cms/cms_pwri.c index d7414883396c..9f98840244ea 100644 --- a/crypto/openssl/crypto/cms/cms_pwri.c +++ b/crypto/openssl/crypto/cms/cms_pwri.c @@ -215,7 +215,7 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen, /* Check byte failure */ goto err; } - if (inlen < (size_t)(tmp[0] - 4)) { + if (inlen < 4 + (size_t)tmp[0]) { /* Invalid length value */ goto err; }