From nobody Tue Sep 29 16:09:12 2026 X-Original-To: dev-commits-src-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 4hvNQx2M6Zz6tm3r for ; Tue, 29 Sep 2026 16:09:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvNQw5lx1z4qrL for ; Tue, 29 Sep 2026 16:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LV+F1KJazhuYk83IU477b/FW4wGk9Tv1RjDu0u4aWjw=; b=ueF2zNx9pLVndSENRoO31oZ/auyeJv9rbf9efDU6JZ0DcHD7lXVBTfTYVlXWf1F3i/N8Yj K1SD9mnJTpGFX1MVzkWbJb9KxXlJElzIbSx+GgBEvNGvBbw8Jm4sbvh9gM1dYEt5xvxF8+ 9dSxjPgMjep7CWxgteCCXEcOwq3blhSFgpzryqbo9NKWz3o+ecearkCf6jgAEPSQUbF5YD 1JXWqqXQR4jC06vm5Oxjxq8qDXX9tB5+qqcVVbRD9jvZ3tUxXdG0xnUQi8RfeZDgaALWpu jdjYcOhHCe0lsRUmPLDAPnZXI4AfBdSTQWP+CS37pKNDM8XzJuCu3leeGx3pFw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790698153; b=jLVz32XhgPWbPLF4IgqFzV5abymmg/hsvBSvP33XeodQFi+RaS/BZapdWxMD3LJMhhHmfV GoTfzk3WTV/osUvp9M/wq3ecIsfUBT2XA1XYmocDKCQZ7j2PTunMOHSBlnDEdyCWF08+Dy 3DrsbiXh7aLS9sA+X4LHKM+FCjw+8CJrNyic89ZsNRuTvktVY0HwNBzy78+7JARCWdyBH4 gv3x5CKC1dcGMfGx1B9FcwCdkBVneKuPsMpgwwFd5Uwow1tLfc7iDsBO01lhUNXfLT/Dr/ xgOy0yEGZZfwwMr0KT3VEdyzMOntm0vkthRBLlr4aSADFJJ699T9ugHLEDgWDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LV+F1KJazhuYk83IU477b/FW4wGk9Tv1RjDu0u4aWjw=; b=ken79MWn4xai9MKfEU9uQ34ZlOhKXX0/lJNYnCwxwQnMU6j03Bz5D2b03c/BOSIramzsV+ b7ySA3+6IAMQA6mqu9mxW0WYiI87GtYwdhd4ZrMborMso+ebMl6ACRzqWLqq41UwX4xGDI 8mg677sjZDxGf4PNsnjHEG0uepRxQkZ/DDiz6tyOhTy0L9DqFhIbxMcSbriJWaWVNdCHfQ Ky551G9CUCHsABQY8Dd3ykVlFFo4SlG1OOvpS4ANBLVyRXdPJx7ou4QabTXVt28FzQNyX7 1QuZ40106qB+1i3DsRfCBO2fDVqm2u4x1BgRDGZ7/i2ljT1tRJNiIjmLpGWZpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hvNQw3Zbzz1Kkl for ; Tue, 29 Sep 2026 16:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 16:09:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gordon Tetlow From: Mark Johnston Subject: git: da952574154d - releng/14.5 - openssl: Fix CVE-2026-84782 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: da952574154d3ff00b99697872e69270d9915aac Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 16:09:12 +0000 Message-Id: <6abbe2a8.30a2a.1f5b779@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da952574154d3ff00b99697872e69270d9915aac commit da952574154d3ff00b99697872e69270d9915aac Author: Gordon Tetlow AuthorDate: 2026-09-27 22:05:27 +0000 Commit: Mark Johnston CommitDate: 2026-09-28 19:09:31 +0000 openssl: Fix CVE-2026-84782 This is a backport of an upstream commit to fix: dtls: reset init_off before retransmitting a message Approved by: so Security: FreeBSD-SA-26:68.openssl Security: CVE-2026-84782 --- crypto/openssl/ssl/d1_lib.c | 17 +++++++++++++++++ crypto/openssl/ssl/statem/statem_dtls.c | 2 ++ 2 files changed, 19 insertions(+) diff --git a/crypto/openssl/ssl/d1_lib.c b/crypto/openssl/ssl/d1_lib.c index 3b4328d3c35a..d954b40a94eb 100644 --- a/crypto/openssl/ssl/d1_lib.c +++ b/crypto/openssl/ssl/d1_lib.c @@ -416,6 +416,23 @@ int dtls1_handle_timeout(SSL *s) } dtls1_start_timer(s); + + /* + * If write_state is anything other than WRITE_STATE_TRANSITION, a write + * is still parked mid-flight (WANT_WRITE) from a previous call into the + * state machine - the current flight hasn't actually finished going out + * yet, so there's nothing valid to retransmit. Retransmitting anyway + * would reconstruct an already-sent message from the retransmit queue + * into s->init_buf/s->init_off/s->init_num/s->d1->w_msg - the same + * fields the parked write is still using - corrupting that write's + * state out from under it. Leave it alone and let the next + * SSL_read()/SSL_write()/SSL_accept()/SSL_connect() call resume the + * parked write normally instead. + */ + if (s->statem.state == MSG_FLOW_WRITING + && s->statem.write_state != WRITE_STATE_TRANSITION) + return 0; + /* Calls SSLfatal() if required */ return dtls1_retransmit_buffered_messages(s); } diff --git a/crypto/openssl/ssl/statem/statem_dtls.c b/crypto/openssl/ssl/statem/statem_dtls.c index ec6dee45b5d5..668b838b6600 100644 --- a/crypto/openssl/ssl/statem/statem_dtls.c +++ b/crypto/openssl/ssl/statem/statem_dtls.c @@ -1196,6 +1196,8 @@ int dtls1_retransmit_message(SSL *s, unsigned short seq, int *found) memcpy(s->init_buf->data, frag->fragment, frag->msg_header.msg_len + header_length); s->init_num = frag->msg_header.msg_len + header_length; + /* Always retransmit from the start, not wherever init_off was left */ + s->init_off = 0; dtls1_set_message_header_int(s, frag->msg_header.type, frag->msg_header.msg_len,