From nobody Tue May 28 17:04:45 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 4Vpf5B1dXpz5MkFG; Tue, 28 May 2024 17:04:46 +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 4Vpf596rQ6z4HfF; Tue, 28 May 2024 17:04:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716915886; 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=oPlEBXkYo3D93mCLLuXRdNgF2bEvgoVm0WRybGokA30=; b=BXjMGDUyMSSR6JEbSriL4vGvJZgj/ezBkDHgovMIPpAI2Znj9POq2z7AhFMnH7jpYpNxJO OPKKKXRAK+vAAUc4e8BpMA3uaZBHoAKwPCk6ansI4qY+9bO9mN6/gjGH7oEb9HHa1Oear/ vfbNo3g/QUDY35mo/JC7iHtgc6In/ecWd8EIu7Fkk50a5nEcrwu6G7JJ7a29AwiqYlF914 fvrFyTOl7fuBC7aS340mEYGPT2gCGNB/ASDOXqcsDwlhaJKnxXsZq95NDNU7/YJLLbLpSz uLgF4k0lxRZEAbZ0NdzYIENOIFdSMzepnJkvUdgJ44Q7lInGOSNvqQyh30BO0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716915886; a=rsa-sha256; cv=none; b=depQjxcXn//GqXkNIZ6N5aRjciTd/kbisRXIEcAx/WBvIc0p2Exy8RWUz8T5JXE2VOwQIw lMs6+pKcMQhsDjp4IFavxkjAqK8O/V1PDfILMZt/+/i5CWEEyzAR+I38yXfbU6pxw9GFe8 dDNNwUtQexwGSMuhh5WziCAqteqrOZ1cPR0WOR9qX4LY8xbT1h7RDMJqJ7HaDf/nAXiCJL lmotpC7jIBnJwBH5vNay4U1o2BNHHmWRAgblnNlsvOuJCeII/mLnBuLS3FTXQeqZGdtpcK 1vkUnSUTMPtQKct8NBbVZi9Hq24pG39rM9HAOvSc+qJJrml2k5pkLE5o6i1DSQ== 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=1716915886; 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=oPlEBXkYo3D93mCLLuXRdNgF2bEvgoVm0WRybGokA30=; b=c7pzO2Gz4V4/ZQOfImWOAygbF3R52/PEvr1JNDNG4zzexzzv1vLssoOCZIEfR3+XwTAsYU LD+8PCphfYTWNJxaPWQb/P64rJ7otr+wLijGVqS//SpCHM6sFJlI75skvR8PD14zKmnA7w u05AcgelpQLEjLoP7dk84lOTuAgJPaTFHXZOlHjyc2SemmhdTvC5V1VohTf2RFYZFWUnRt up348EkHM8f79zSsGCnAPu1ye6RbDTD9nCzaSTTxPmLy/4kXOhNOpOXUlJTbrJ/s9B+Afk 6TFHUZ2Dj0PL5Nq2vlFGyvkV3ZQm0NwY9cVZN6cUfAcVIv+fFD07SG8YaZyZ/A== 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 4Vpf5965HxzLJK; Tue, 28 May 2024 17:04:45 +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 44SH4j4T010672; Tue, 28 May 2024 17:04:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SH4jOX010669; Tue, 28 May 2024 17:04:45 GMT (envelope-from git) Date: Tue, 28 May 2024 17:04:45 GMT Message-Id: <202405281704.44SH4jOX010669@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: 8256e014b828 - 2024Q2 - security/openssl31-quictls: 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: 8256e014b8284b12cd4099040d4da50e59cd8e34 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=8256e014b8284b12cd4099040d4da50e59cd8e34 commit 8256e014b8284b12cd4099040d4da50e59cd8e34 Author: Bernard Spil AuthorDate: 2024-05-28 16:57:52 +0000 Commit: Bernard Spil CommitDate: 2024-05-28 17:04:18 +0000 security/openssl31-quictls: Security update for CVE-2024-4741 Security: 73a697d7-1d0f-11ef-a490-84a93843eb75 MFH: 2024Q2 (cherry picked from commit ae294f2b6be9c77a0516a78dd92a9f8958758c47) --- security/openssl31-quictls/Makefile | 2 +- .../openssl31-quictls/files/patch-CVE-2024-4741 | 67 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile index 5f66ce2edc72..99afcb80ff7b 100644 --- a/security/openssl31-quictls/Makefile +++ b/security/openssl31-quictls/Makefile @@ -1,7 +1,7 @@ PORTNAME= openssl DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 3.1.5 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONSUFFIX= -quic1 CATEGORIES= security devel PKGNAMESUFFIX= 31-quictls diff --git a/security/openssl31-quictls/files/patch-CVE-2024-4741 b/security/openssl31-quictls/files/patch-CVE-2024-4741 new file mode 100644 index 000000000000..75fcc6311d2c --- /dev/null +++ b/security/openssl31-quictls/files/patch-CVE-2024-4741 @@ -0,0 +1,67 @@ +From 704f725b96aa373ee45ecfb23f6abfe8be8d9177 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) +--- + 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 e747b7f90aa71..9088223b9f6bb 100644 +--- ssl/ssl_lib.c.orig ++++ ssl/ssl_lib.c +@@ -5493,6 +5493,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; + }