From nobody Sun Apr 14 19:36:11 2024 X-Original-To: dev-commits-ports-branches@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 4VHgXC3LN8z5Gwbm; Sun, 14 Apr 2024 19:36:11 +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 4VHgXC2Pp3z4kJ0; Sun, 14 Apr 2024 19:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713123371; 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=gBW47nunONZcqUWN7FDzl7KuVhiGsVgpaPdWfSSPrOE=; b=JvbsRX3rwejHklGXjPviPyHAzw5KPqnrHdXuugu6kdDwTBJKvRBSHMdIAxEO3hoigHwKYU 9L+m+OUNYDptnavogXyPsiRrgZpykOvBCoQ1dAKiOG48/vbuCpFyr0YjEawW08CFPrLvAz Z+pb1PlDrAlG4+qNFVIp1azPfVrYT743Axv7GS0FOzvhHwdYeNwPeGQV04TY2wbcs1ED3o WmEt79pD6wsfc6n6R9DmgDXnC6/AG0i1xhVqXZ2BOlCbYR2+vToNY6O4lfaGj6p6pkl8VV +na8qmvhIMvtXNB1lfG1h/6tBhB0DEUCLeYfQesEWQRHFmuXktrx4C3NQQgG1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713123371; a=rsa-sha256; cv=none; b=mXZSc3qn0mJ4datGFi+1/fn4HB346FequHnNDUpHkumlCfskOFlHw+ITwtkzkDIRpbojWG hkcYD/9KbHZk0081zShRSda2FOf/KUCj8Q1com/00SqVaW540+hK0rg7WG2Te+sKoHApkx vpeYUDsuMPdKyqPDi1V9aZa3AKFAcLnMuqjXDE9zg1oZkuA6nXLUuTnttsXiCSe0EkhSyy UJpAQFokcZhRIpaGlHe0nXppsz3OrOFbpD4eL4FvFW7srI+QOa84vUJv1vLWCdv1CNf6Sw MlKNRY/8EQ2sCT4t9nRV6F4yLBq6kTqC/zHk7109s3Ms4rY8cga8Ets4lkxTrA== 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=1713123371; 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=gBW47nunONZcqUWN7FDzl7KuVhiGsVgpaPdWfSSPrOE=; b=mpENKgEP1x1UKTzhCisEk04Grua2CfV4MWwF/zgtr40gys7IHG4AZZgzGiKwH3LPrN7IIh RYUbHok2G9cUUGcwhXTZRKmoHGOkHCnQWffhwfRTp2317DTplGb5ZeLHq0HgUln3ymziMF uexxT1wYi8C76hK8UPV3I/+m5XHK1M02qDzyDtpMmNi7TM8GZ6A4h+f5/yfwqHZFd6Qs8S YV2w5C4wPMdsPBat6Tyh7S3/H9iptflfzvqiMpRecwwTsWYh9e+MICq5C3rEP9HJGxebQR sdU9j28/VpBNCyB8HDFkW00QJuSEONJIMkngpyULN+TB6/4GQv9snHhd6o7ksQ== 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 4VHgXC21XMzT82; Sun, 14 Apr 2024 19:36:11 +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 43EJaBJZ090052; Sun, 14 Apr 2024 19:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43EJaBoC090049; Sun, 14 Apr 2024 19:36:11 GMT (envelope-from git) Date: Sun, 14 Apr 2024 19:36:11 GMT Message-Id: <202404141936.43EJaBoC090049@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: 86bfe8648977 - 2024Q2 - security/openssl31-quictls: Security update for CVE-2024-2511 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@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: 86bfe86489779cc6037a099b2fcf6e869cd3b782 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=86bfe86489779cc6037a099b2fcf6e869cd3b782 commit 86bfe86489779cc6037a099b2fcf6e869cd3b782 Author: Bernard Spil AuthorDate: 2024-04-14 19:22:29 +0000 Commit: Bernard Spil CommitDate: 2024-04-14 19:36:02 +0000 security/openssl31-quictls: Security update for CVE-2024-2511 Security: 7c217849-f7d7-11ee-a490-84a93843eb75 MFH: 2024Q2 (cherry picked from commit 68e85338517b8da4121bef9d3722cc4d6abea91b) --- security/openssl31-quictls/Makefile | 2 +- .../openssl31-quictls/files/patch-CVE-2024-2511 | 116 +++++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile index e37460731417..4f829d9afa6e 100644 --- a/security/openssl31-quictls/Makefile +++ b/security/openssl31-quictls/Makefile @@ -1,7 +1,7 @@ PORTNAME= openssl DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 3.1.5 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -quic1 CATEGORIES= security devel PKGNAMESUFFIX= 31-quictls diff --git a/security/openssl31-quictls/files/patch-CVE-2024-2511 b/security/openssl31-quictls/files/patch-CVE-2024-2511 new file mode 100644 index 000000000000..ac88f50f791c --- /dev/null +++ b/security/openssl31-quictls/files/patch-CVE-2024-2511 @@ -0,0 +1,116 @@ +From 7e4d731b1c07201ad9374c1cd9ac5263bdf35bce 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) +--- + 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 b5cc4af2f0302..e747b7f90aa71 100644 +--- ssl/ssl_lib.c.orig ++++ ssl/ssl_lib.c +@@ -3737,9 +3737,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 bf84e792251b8..241cf43c46296 100644 +--- ssl/ssl_sess.c.orig ++++ ssl/ssl_sess.c +@@ -154,16 +154,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; + +@@ -287,6 +282,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 5d59d53563ed8..8e493176f658e 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) {