From nobody Sun Apr 14 19:22:49 2024 X-Original-To: dev-commits-ports-main@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 4VHgDn5dGbz5Gvly; Sun, 14 Apr 2024 19:22:49 +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 4VHgDn51Dqz4hdS; Sun, 14 Apr 2024 19:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713122569; 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=jhadaF3qauqpnL8q6DY56WCvanTKDKd4hMxI0+NCZlA=; b=jJgerJeiAgGUoOmNMOj0BeDd62i/Ey6mR5Lc0YOqOp9M1Hki9qKd6URu8apCD4ztjmjQb6 yNJE1Wzi01S1VQtUqRJhvfrnhOJXRfRh4e8pZXKt03J618Yp3kMQnTX45oLqIIN6MHj9Y/ dvQDuQ9UdIR/te8SWThGR2/iY0/1BBkPj0YZf92B+WFs45dPG6mv20NGsXtEUU3TzR+hv0 ojPjUUaX8oFBOG++/bD8AbE9crF590fu2GHHJS+ncZe+A9axQGfbGifhmZXlJSBmQ/hYUm 6563A3+lHdO6A/30FYXnGtkrd8haRFxYOW2ldlsPYgGi/m58xp3x/eoFAlSm2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713122569; a=rsa-sha256; cv=none; b=QFJubJtV7PZEItBt4bEy5a1Cz94hMIBAkTs+MZaldvU3DndGi9pv2IMtHy8eVhIQKjDrih xRq5KdQKPHeS4+jAA1um8KDGzF0JpcPlZQKH/NtoREs4zyCa+rcd+uRYrmWaQCBGX/ubh0 Hn7J1bbQwKRnkEkAgy+O/7dT5U1OqpI3mnjfGsdRUjj/dfRstHN3qNFRRVBOOJzhenHLkk dFYemiOq0zmDM5n/GUGEoWXIhKNoIBBkbBL2Y/WYH7gWGaugmFhoJuTa3LTVG2q6FxZPK6 CV+/Gb9XOWMBFiuYYptUP109oxPQ+/BulzCou5VEe82Snav7iVrkisNnbKOhwg== 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=1713122569; 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=jhadaF3qauqpnL8q6DY56WCvanTKDKd4hMxI0+NCZlA=; b=kelZqwa4YZmWOcdcUvU9nBZvQZfSzYMeWi5Hp8zLlZq4qh9PCuOPiieCJcZZxh+XkcjEMJ LRXCSRnWIS0pq8RebK0+ZO/cUz+VLaYtNb4AoN7weSUHaUtiuhS+ljUv+Y38NmNSPA0EcS 8kYevyi0weZWc2f5cKVyy5bvBt7OVhmx6hpdBUMnZC7fuWFu+CPmlGc6XEimfVvu/8t1qE HP4c3QOUu+W18ejJhHD30iSgOPi/pz5tWXjZ4mZkFJnn2ds3EI2FrmBvZMeUtRxgCY10eu m4Xi47Tnh2qQDPy0HecZL/1VzBaWsrHdCdkPs2t2qLKBwoYQqoYbMAnsCQCS8g== 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 4VHgDn4czYzShv; Sun, 14 Apr 2024 19:22:49 +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 43EJMn5l072630; Sun, 14 Apr 2024 19:22:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43EJMnog072627; Sun, 14 Apr 2024 19:22:49 GMT (envelope-from git) Date: Sun, 14 Apr 2024 19:22:49 GMT Message-Id: <202404141922.43EJMnog072627@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: 3d9fc064b701 - main - security/openssl: Security update for CVE-2024-2511 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@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: 3d9fc064b701d8a3af170cfb76042c611d2f1dd0 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d9fc064b701d8a3af170cfb76042c611d2f1dd0 commit 3d9fc064b701d8a3af170cfb76042c611d2f1dd0 Author: Bernard Spil AuthorDate: 2024-04-14 19:20:42 +0000 Commit: Bernard Spil CommitDate: 2024-04-14 19:20:42 +0000 security/openssl: Security update for CVE-2024-2511 Security: 7c217849-f7d7-11ee-a490-84a93843eb75 MFH: 2024Q2 --- security/openssl/Makefile | 2 +- security/openssl/files/patch-CVE-2024-2511 | 118 +++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index f87321fdb628..2746bb51cdcc 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssl PORTVERSION= 3.0.13 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/files/patch-CVE-2024-2511 b/security/openssl/files/patch-CVE-2024-2511 new file mode 100644 index 000000000000..168faba4a3ea --- /dev/null +++ b/security/openssl/files/patch-CVE-2024-2511 @@ -0,0 +1,118 @@ +From b52867a9f618bb955bed2a3ce3db4d4f97ed8e5d Mon Sep 17 00:00:00 2001 +From: Matt Caswell +Date: Tue, 5 Mar 2024 15:43:53 +0000 +Subject: [PATCH] Fix unconstrained session cache growth in TLSv1.3 + +In TLSv1.3 we create a new session object for each ticket that we send. +We do this by duplicating the original session. If SSL_OP_NO_TICKET is in +use then the new session will be added to the session cache. However, if +early data is not in use (and therefore anti-replay protection is being +used), then multiple threads could be resuming from the same session +simultaneously. If this happens and a problem occurs on one of the threads, +then the original session object could be marked as not_resumable. When we +duplicate the session object this not_resumable status gets copied into the +new session object. The new session object is then added to the session +cache even though it is not_resumable. + +Subsequently, another bug means that the session_id_length is set to 0 for +sessions that are marked as not_resumable - even though that session is +still in the cache. Once this happens the session can never be removed from +the cache. When that object gets to be the session cache tail object the +cache never shrinks again and grows indefinitely. + +CVE-2024-2511 + +Reviewed-by: Neil Horman +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/24044) + +(cherry picked from commit 7e4d731b1c07201ad9374c1cd9ac5263bdf35bce) +--- + ssl/ssl_lib.c | 5 +++-- + ssl/ssl_sess.c | 28 ++++++++++++++++++++++------ + ssl/statem/statem_srvr.c | 5 ++--- + 3 files changed, 27 insertions(+), 11 deletions(-) + +diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c +index 2c8479eb5fc69..eed649c6fdee9 100644 +--- ssl/ssl_lib.c{.orig} ++++ ssl/ssl_lib.c +@@ -3736,9 +3736,10 @@ void ssl_update_cache(SSL *s, int mode) + + /* + * If the session_id_length is 0, we are not supposed to cache it, and it +- * would be rather hard to do anyway :-) ++ * would be rather hard to do anyway :-). Also if the session has already ++ * been marked as not_resumable we should not cache it for later reuse. + */ +- if (s->session->session_id_length == 0) ++ if (s->session->session_id_length == 0 || s->session->not_resumable) + return; + + /* +diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c +index d836b33ed0e81..75adbd9e52b40 100644 +--- ssl/ssl_sess.c.orig ++++ ssl/ssl_sess.c +@@ -152,16 +152,11 @@ SSL_SESSION *SSL_SESSION_new(void) + return ss; + } + +-SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) +-{ +- return ssl_session_dup(src, 1); +-} +- + /* + * Create a new SSL_SESSION and duplicate the contents of |src| into it. If + * ticket == 0 then no ticket information is duplicated, otherwise it is. + */ +-SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket) + { + SSL_SESSION *dest; + +@@ -285,6 +280,27 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) + return NULL; + } + ++SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src) ++{ ++ return ssl_session_dup_intern(src, 1); ++} ++ ++/* ++ * Used internally when duplicating a session which might be already shared. ++ * We will have resumed the original session. Subsequently we might have marked ++ * it as non-resumable (e.g. in another thread) - but this copy should be ok to ++ * resume from. ++ */ ++SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) ++{ ++ SSL_SESSION *sess = ssl_session_dup_intern(src, ticket); ++ ++ if (sess != NULL) ++ sess->not_resumable = 0; ++ ++ return sess; ++} ++ + const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) + { + if (len) +diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c +index a9e67f9d32a77..6c942e6bcec29 100644 +--- ssl/statem/statem_srvr.c.orig ++++ ssl/statem/statem_srvr.c +@@ -2338,9 +2338,8 @@ int tls_construct_server_hello(SSL *s, WPACKET *pkt) + * so the following won't overwrite an ID that we're supposed + * to send back. + */ +- if (s->session->not_resumable || +- (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) +- && !s->hit)) ++ if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER) ++ && !s->hit) + s->session->session_id_length = 0; + + if (usetls13) {