From nobody Tue Sep 30 15:37:25 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 4cbhyG0zrwz69Fd5; Tue, 30 Sep 2025 15:37:26 +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 4cbhyF5DVxz3V5c; Tue, 30 Sep 2025 15:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246645; 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=zUQeZtlpRUgwGLm6LFcLD2oeGBw9wfaYVeUvUntBviQ=; b=aRv7zB1eG9pI/j9AkspjF2BFqCqR+X2yNOZ4ee1bQdVdKteVJVTpAjr/z/A/NYsBsDCucF 6Bk1s46nhT0IzwMSejuQC+WDBWx2Q2ctZBfEMOYR9oztFOMEoz3+04qE9SnVyS74AWopH4 s0LDPw2LxKqr468HtEmqETLYM3DLaWZ/q8GNOWZBaKk+oBsGIsX0ewpGX38KM4bsnPpHy+ Y88S0tPsrKJFfmAyP1BdTE+9g1oebqJMoiarTrZs7cd0p0jJ9o6jW2w+FXXSoYKBzMKmMd law+qP1B+I2ZkJNP84ss888AjeRtVgQTh5XfXv+asI/2dfA/Hrg1eHtgqgppMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759246645; 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=zUQeZtlpRUgwGLm6LFcLD2oeGBw9wfaYVeUvUntBviQ=; b=oF1zDsguzDKxO7wnjg0iF9P4b3CWsUgrAt2JfRykvUIQC5BNqEk9k2JkE+SHipOfHDnZOG h/RKp5UpLuylaz5qzcYnOwQH4r4mP9tjUO/zuWD3s4S+RTcPWRJ4Vt/7VKHt0jOqvmLBj2 2KGJ0+Ja5RS9f5sc6M26gE+StBiwXryMTh3DQl+9lj4V3AJk/E7bb3nooyHg6FXMyEf2HP tXU+BCV45pvhOL81Vn8uWSRhWY+9kvNAou5s6BddnmarovSnqYNjGPupGpnAAUeKr+d6f/ 69Ej9pkstxXc9EuE+Ju+SQM5Qz7T6WeZFaSPrbw+pyxr88fC93itiZTmwPhhwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759246645; a=rsa-sha256; cv=none; b=yk07uAZmFLW2OlZDSEkK6B3gsxJfyO9UtsNRRGRr9X+SxFDIRI3khzTcua57yjjIMK+OUY Cf+QOLvhpph8tOFDiP/1UmJkRhJBUpNxfIOVqNbnB7v67dP3vYLuJgND6uHcj5QjZUL8hH lbkm54Y5Xq1vWToudffWcnK/qNyGYfHOBIQqFQuTVgeevNBTr5AYdoVHif67hcJ79sP4le qFVdbLRgpg/JEhTRyh6ktzR4Oiym23F6y1lfcpKR/MwLfWS76D3YEvaHmjDtK1mkV0lzI3 9ucJ1KOmBG5vMXJYFFuzQfUvsU56ABFqs5ycx82dSvxEhNVeJ+1vSHJJ4074XQ== 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 4cbhyF4lvczjkK; Tue, 30 Sep 2025 15:37:25 +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 58UFbPwE067795; Tue, 30 Sep 2025 15:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFbPix067793; Tue, 30 Sep 2025 15:37:25 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:37:25 GMT Message-Id: <202509301537.58UFbPix067793@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: 6a0d914d9c3e - releng/14.2 - Fix multiple security issues in 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/14.2 X-Git-Reftype: branch X-Git-Commit: 6a0d914d9c3ebd8c150b7f90e79616d16efefee8 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0d914d9c3ebd8c150b7f90e79616d16efefee8 commit 6a0d914d9c3ebd8c150b7f90e79616d16efefee8 Author: Gordon Tetlow AuthorDate: 2025-09-30 15:27:08 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-30 15:31:54 +0000 Fix multiple security issues in OpenSSL. Out-of-bounds read & write in RFC 3211 KEK Unwrap (CVE-2025-9230) Out-of-bounds read in HTTP client no_proxy handling (CVE-2025-9232) Obtained from: OpenSSL Approved by: so Security: FreeBSD-SA-25:08.openssl Security: CVE-2025-9230 Security: CVE-2025-9232 (cherry picked from commit 270158508d7c55a0737c2a9915cd4afc8fabdaf0) --- crypto/openssl/crypto/cms/cms_pwri.c | 2 +- crypto/openssl/crypto/http/http_lib.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/openssl/crypto/cms/cms_pwri.c b/crypto/openssl/crypto/cms/cms_pwri.c index 2373092bed55..6b507c3f0176 100644 --- a/crypto/openssl/crypto/cms/cms_pwri.c +++ b/crypto/openssl/crypto/cms/cms_pwri.c @@ -228,7 +228,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; } diff --git a/crypto/openssl/crypto/http/http_lib.c b/crypto/openssl/crypto/http/http_lib.c index 9c41f57541d7..614fd200b7c0 100644 --- a/crypto/openssl/crypto/http/http_lib.c +++ b/crypto/openssl/crypto/http/http_lib.c @@ -267,6 +267,7 @@ static int use_proxy(const char *no_proxy, const char *server) /* strip leading '[' and trailing ']' from escaped IPv6 address */ sl -= 2; strncpy(host, server + 1, sl); + host[sl] = '\0'; server = host; }