From nobody Tue May 28 16:37:52 2024 X-Original-To: dev-commits-ports-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 4VpdV85yG2z5Mgkm; Tue, 28 May 2024 16:37:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VpdV85TgKz4Dp5; Tue, 28 May 2024 16:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716914272; 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=UhfbGWp5SdnvRghsHC09Bohj8FTzPdmbmyrzDN7fEms=; b=V3ywwwzAIOWlNRvhOlIqVloEwgrBVemkYmkBvbMoowbpWXgVqvRFUkc4YdZ5oGfKpgVian cR/xhxRd7x+dVLY0DZ5w7ovWQXdA6cBwbbBe995xJQ4dYf7Q8iCwk7AiayEj/1VIPWQFfX MQyukyA6VnRVREkICX/dKHrRiqjV5J5NFZSd5ICnkkcBXbMJ+MFCGIhg76yrgt+WHOjhYL eN7o946ivsJi8hdDeD6aNXeN5RQQUCuthOyilxOGruai9tNKRowg/zLcbiJhTK1ZcICbv+ SS1RzOxWrT7OUtRUBWoVjxVpsUrtXQ0jvdqFofjANv3p58TdjYXWxUVW7DKezQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716914272; a=rsa-sha256; cv=none; b=FhvPok4tEnIhLXvypNx6UDdtGXWukAzPAoZtfgn07SKnnXJU3q5AKR8PKAnNijnkY8Jhgi V114LALWZAWXr/0MDhTp4anM5gGDUMDhr9+J+cquKkNTkHDuvKTNWVz4MR6DQjAO0SnJYK Cq88bKmGcd/iVP1OGFw5QsvAts05EExilaCT/ER5ygkBE8yawKX+fOook21VQpb/uaqQOY LeJxYgVT08aZmFIjOaJ8wGYEOxEFAoYtlfoAYXlOcvYPbIPYn5QabxLuvAfS84nL6JvT2J 0IyGR68fjUafHMs18VhmPCVo32BZ34crPGxzLjHIoVbNT1o7RARQZwUWBrKfTg== 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=1716914272; 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=UhfbGWp5SdnvRghsHC09Bohj8FTzPdmbmyrzDN7fEms=; b=NrepDZDQ17hmHe8a8spRaB81lgxOURA4zUUnCTGF6HMrSYpFJliImGEgykYduU7c30FQ7z hZOOpsuC1DHQ8O9ZcPgqkP3o1WsNBILrPkxdHgZgs1UDjbO8rjngw5KzInxKKtoGd36LZx DtCsXRdo9KO/LZANNEm3RFZI6u2tRibqLB4J4EMcja3KUcGJXVB4/Qb5tN3TPwRAUjB8f8 7AhgXlCjhFuF/o5De1o9VYyS0uoym0L7/b08kEEab2SlUe+zyIQjDBWOH56Y2vJZISFOlZ LhumL0c6WCtcaNkJjPD5agx+3zRglEsEr3vpyy7Yi0bRj0fNfAe3IgJSwab9rg== 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 4VpdV84z9jzKRf; Tue, 28 May 2024 16:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44SGbqEv058541; Tue, 28 May 2024 16:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SGbqCm058539; Tue, 28 May 2024 16:37:52 GMT (envelope-from git) Date: Tue, 28 May 2024 16:37:52 GMT Message-Id: <202405281637.44SGbqCm058539@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 8f412df6e5e8 - main - security/openssl: Security update for CVE-2024-4741 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f412df6e5e84f7c20d3fdb4ea73d6dda4ad2400 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f412df6e5e84f7c20d3fdb4ea73d6dda4ad2400 commit 8f412df6e5e84f7c20d3fdb4ea73d6dda4ad2400 Author: Bernard Spil AuthorDate: 2024-05-28 16:35:14 +0000 Commit: Bernard Spil CommitDate: 2024-05-28 16:35:14 +0000 security/openssl: Security update for CVE-2024-4741 Security: 73a697d7-1d0f-11ef-a490-84a93843eb75 MFH: 2024Q2 --- security/openssl/Makefile | 2 +- security/openssl/files/patch-CVE-2024-4741 | 69 ++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 4a01b462ef31..c1bf75453382 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssl PORTVERSION= 3.0.13 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/files/patch-CVE-2024-4741 b/security/openssl/files/patch-CVE-2024-4741 new file mode 100644 index 000000000000..f4f5ca1069a1 --- /dev/null +++ b/security/openssl/files/patch-CVE-2024-4741 @@ -0,0 +1,69 @@ +From b3f0eb0a295f58f16ba43ba99dad70d4ee5c437d Mon Sep 17 00:00:00 2001 +From: Watson Ladd +Date: Wed, 24 Apr 2024 11:26:56 +0100 +Subject: [PATCH] Only free the read buffers if we're not using them + +If we're part way through processing a record, or the application has +not released all the records then we should not free our buffer because +they are still needed. + +CVE-2024-4741 + +Reviewed-by: Tomas Mraz +Reviewed-by: Neil Horman +Reviewed-by: Matt Caswell +(Merged from https://github.com/openssl/openssl/pull/24395) + +(cherry picked from commit 704f725b96aa373ee45ecfb23f6abfe8be8d9177) +--- + ssl/record/rec_layer_s3.c | 9 +++++++++ + ssl/record/record.h | 1 + + ssl/ssl_lib.c | 3 +++ + 3 files changed, 13 insertions(+) + +diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c +index 4bcffcc41e364..1569997bea2d3 100644 +--- ssl/record/rec_layer_s3.c.orig ++++ ssl/record/rec_layer_s3.c +@@ -81,6 +81,15 @@ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl) + return SSL3_BUFFER_get_left(&rl->rbuf) != 0; + } + ++int RECORD_LAYER_data_present(const RECORD_LAYER *rl) ++{ ++ if (rl->rstate == SSL_ST_READ_BODY) ++ return 1; ++ if (RECORD_LAYER_processed_read_pending(rl)) ++ return 1; ++ return 0; ++} ++ + /* Checks if we have decrypted unread record data pending */ + int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl) + { +diff --git a/ssl/record/record.h b/ssl/record/record.h +index 234656bf93942..b60f71c8cb23b 100644 +--- ssl/record/record.h.orig ++++ ssl/record/record.h +@@ -205,6 +205,7 @@ void RECORD_LAYER_release(RECORD_LAYER *rl); + int RECORD_LAYER_read_pending(const RECORD_LAYER *rl); + int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl); + int RECORD_LAYER_write_pending(const RECORD_LAYER *rl); ++int RECORD_LAYER_data_present(const RECORD_LAYER *rl); + void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl); + void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl); + int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl); +diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c +index eed649c6fdee9..d14c55ae557bc 100644 +--- ssl/ssl_lib.c.orig ++++ ssl/ssl_lib.c +@@ -5492,6 +5492,9 @@ int SSL_free_buffers(SSL *ssl) + if (RECORD_LAYER_read_pending(rl) || RECORD_LAYER_write_pending(rl)) + return 0; + ++ if (RECORD_LAYER_data_present(rl)) ++ return 0; ++ + RECORD_LAYER_release(rl); + return 1; + }