From nobody Tue May 28 17:04:38 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 4Vpf532YZqz5MkHV; Tue, 28 May 2024 17:04:39 +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 4Vpf5319Gzz4HGG; Tue, 28 May 2024 17:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716915879; 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=HVUdgvcFFzslpaJN2ar7ZQPUnwV+oGZNQg3j5wB/h/I=; b=XOWbFctpU39oy3P4lwnX99KZzrIpGShWJeXfhyAk8OeXD/Fm9zN12cta8RTspgGVYARriX WWM/BXGgShzjeg9JmUkGvbcXrqxtwF8t4E3j6z+f06OoG0EoRL7YFCkA4oAVCHcyOWe1uH ENnexE3UcDiDYNmkBs7g1by8nO2gTQb8fGBLDFxm5Yl0bCD6H4m+Kbg3r67+KAoIUlAv81 9U5RCbYBVQ9RbQLMmxonqpz1Yate6HgUtRXXUUGMZrgHfsTJ9YmmxMsmRGK7ILUnRNAWWS tqZAhdUE6V/piQUR0DOOipy1bDCUWgXuREvC778E7kg1v8i23kpkWVI3jmR7BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716915879; a=rsa-sha256; cv=none; b=GHuPXrRuUvJCv13EwG8HkTaDZWLK+5tunVQ90aKiru/Fo5R2k32O357uS9Mhl0yYTQIxiM o6qEclHob4iTh0yBgDEOJk27Pvdh8U53YphH7RrK1WAz+KOGv8PHV59Zn3ec8uPZiVVrcl vWcOQwYN6tYOL6iigtpuJzBdQepX3MwJsPt6ixWXYn1MpX7UqecjdT29HJwXcw8Z4sdQSZ zcphOIBg9y3AFG2nAaplaH5tP5PWWJ2ox0UlBsE2wZ7Tedb7pkYag+wBlG5NVEIlZ/aaM1 c6aTK2PWPNy3nugUd4K4nedI7kmZy34ovlLKP4ch1IgLzkBp7SWoQDB3HD6dnA== 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=1716915879; 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=HVUdgvcFFzslpaJN2ar7ZQPUnwV+oGZNQg3j5wB/h/I=; b=aOzdLCo+iEAV0y5/gOshKn/n8pGlfCJP8aPsk4CDAaqmueJlziMeIVFbGWttpQih8F0u4S hFIYAMT7IUFPmY9wZhUBKluJ8ZRAKOk5Dbuz0V0UGp2aHAjP/A64mn4+1uFa+DFW4dhOis cKXzgiAmlu1wJsf4A+NAd/fL6K0KZx13LgY5qsTctCblY3xEqfhJ7Mj9sQV/F7qSzNXyfU Qcm0s9mtLzWQ8ybZHUy2dfkMGV32YOCD2VRSl8AJINj/dE5t4wgTCUskBtHZ09phTkWYJ/ 8AMeR72zBzdZngomsHe6J1GG87NOk1Sf+Y7yvJClxa3LsjSMaXreAPVAB2uXgQ== 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 4Vpf530fsMzL9w; Tue, 28 May 2024 17:04:39 +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 44SH4cOw010395; Tue, 28 May 2024 17:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SH4cvR010392; Tue, 28 May 2024 17:04:38 GMT (envelope-from git) Date: Tue, 28 May 2024 17:04:38 GMT Message-Id: <202405281704.44SH4cvR010392@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: 4daa9973c1c2 - 2024Q2 - 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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 4daa9973c1c24e5e95da339a21452ad8b6cca581 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4daa9973c1c24e5e95da339a21452ad8b6cca581 commit 4daa9973c1c24e5e95da339a21452ad8b6cca581 Author: Bernard Spil AuthorDate: 2024-05-28 16:35:14 +0000 Commit: Bernard Spil CommitDate: 2024-05-28 16:59:32 +0000 security/openssl: Security update for CVE-2024-4741 Security: 73a697d7-1d0f-11ef-a490-84a93843eb75 MFH: 2024Q2 (cherry picked from commit 8f412df6e5e84f7c20d3fdb4ea73d6dda4ad2400) --- 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; + }