From nobody Tue Sep 29 15:56:42 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 4hvN8V50wGz6tl5W for ; Tue, 29 Sep 2026 15:56:42 +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 4hvN8V33Rwz4WPH for ; Tue, 29 Sep 2026 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697402; 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=kn/i4Q379a2BHD4Zgylp+4I/ImfrWf6FrlJ6b7z50cw=; b=MhvAynk/SKAO2pJ/Xk+U8qZE6s9Nw3KQghUmQNBWrPlOZbfQbx39ZcNz4PvQ3/SCOhJPrm bkPwz7ZNIe6UwWmbXjyNeIf+ZTsO16TSvor/fb+MT/xUWl4rdoVGgdWwcoVSkIf9WzMopE kxCp4ZLPg+T7MLVLwqf82FbkXG9d+8R2rZ8nSr0iNEVc/HFy7rh4BqZYU1z6lRLXO/aDYv vc/ZVF9ed0DLwyx/oiDDlONd3IGj/Fn8oAFRTypD0NKj9S9pEKep2ZaHT5N7Yzcl4eeHnQ 2ljWnyeuJEJz4cdP46byjCnMW2/PQAP7uhC06xXopkx4KGWXdWQ0vTXx+1IBWw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790697402; b=kskDqdUavsIbmFr3SZKiimAg/eCr6Yl3iPl35hMxinjHP28oyZgHLeWnxJOjTOhFP44CIS wI6RsHreRmpDDsDeZXBra8F6fBLbTxmSmme5m2SkTPVxFV9N/4OjRsy2GlgvRflqOCqFKj 3sOTl1EtouDJyABql6E/+dgSlWrijCbjk4dCCFhtCRcgcABbUszolG26qhedP6rT+A42TE PfTu+HX1O7J0qUn4HnqnkkIPs/k/KCda73UkbmuBKdIMWaZ9RNdnJgy7qX6h2A4p7/dNQV lowdklRPqmvqjQ0/6j94I5naJXn81RQELL3BjhcndMyvN0ZFhNvCBylmQB2uwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697402; 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=kn/i4Q379a2BHD4Zgylp+4I/ImfrWf6FrlJ6b7z50cw=; b=p8nCHz6/ESaDcKxsOchOy2leG5eh+3NprKq7ia1zT20/TU4mAAdmjK7RfkqlbDB+lqjCnR KE4KmpwTRGs4AAllH69g/JOyTE3k8T7zPaSEELPCP+pJOkmQNUlMo4o/VTlKijMpw1puxn 7d/bwIjww0/u0pbwj7D2XplH2rvvfIYrBZXWtnCn1oghWhcSBm1PFW0g9T8jkCJd/cf0m3 Tb8WsdPZQI1O6Pztb5LRFh/W6wu3AR9b2EL2SSRbi/9g7xjzQLjhwh94SF2gS8lFRh7BM6 pwgzLt8jPvGb1pAwyAhTkO3Rp2l6jn2BjUgOUk0/la7HGeqiJ1HuXL4nQXpmhQ== 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 4hvN8V27Rdz1K29 for ; Tue, 29 Sep 2026 15:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 15:56:42 +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: 7b8e59ccbdfc - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b8e59ccbdfc91acbb1b648a1765e452304606b9 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 15:56:42 +0000 Message-Id: <6abbdfba.262e9.7b15f1a9@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7b8e59ccbdfc91acbb1b648a1765e452304606b9 commit 7b8e59ccbdfc91acbb1b648a1765e452304606b9 Author: Gordon Tetlow AuthorDate: 2026-09-27 22:05:27 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 15:56:33 +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,