From nobody Tue Sep 29 15:57:36 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 4hvN9Y02jtz6tlPM for ; Tue, 29 Sep 2026 15:57:37 +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 4hvN9X44mSz4Ydt for ; Tue, 29 Sep 2026 15:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697456; 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=fix7KoBxuXO+LtgCXJAcHHDVW12xKwxkY8fziL9cEjY=; b=Rg9NnuimT30agfVKSPAIfuE3CNAGbrlbn0sZgxvtJQb1FM0nEtu6sp5ahjz0uDSD9Py/yg QQRG6eGNs+cpJc8y2AkAwjFSZFbz6dbsX7HYniKHlEF3d9FSmn/cjZwZdL0TxHukAYDy4L PzV3hqsCtAUT36G4oZrr5tvXYcn/jVExMZ0wVve6FGAG8IiyiPU2DcDrWrPcgvUypXPrDy RbYLXdINg06F9LtN8Qsj91U+XiUJCXJVZO7ZoQ+0V7Cjqzd+GCVI6s4V/a9RSOoCcglRd9 IA0+8H2W3FIsn2yPcomwbGBOc7XnJOPzXbXCnUsDTzb66rXm2BfS7vrSie/nnA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790697456; b=DrvQEg5a4ZKJdgv6P9ct1ftlIA9cBPhXwBwxJ6DbbaL5DY79QDbvxXgp/WqsERMtUX8jjD 8GH9o3XoHXFltn2ifoCiYfFf2/wNwVwly2p58zfNo6SgD1FRy6RerBQ9+a0Gr8KlAdY8+h VzL2GFvQws7lHdvGlJza13QI/T1D/vSOHmOCxF6Mo4S0aokCben+hcREO6ZboqrAKd2nFE lcs2huG0Dwv++TFbEorVi+GjYSo0PQODeiojbIwIvP01PFbFths5IHmrz0t/9xzT/lRwHZ NLeozAh58W+etSWR0rvCoyPaY3Rkr137H2tcaBca/47tQHv816AhAT+tE75jbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697456; 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=fix7KoBxuXO+LtgCXJAcHHDVW12xKwxkY8fziL9cEjY=; b=Q8cQ0w5WukDIloZgcfS7nfs2EWCaMX4n8ZMlX0oZxJWwBcervRzFMuCd1f74jbXv9Cq1Ea dAfhddruF2aI79eikAvu+cLhYVf9WfewHeMAq0qAzFAmfxJB2eisfiuiHi/mCNyyxlynyX cp9q5elqyfR3hURMSWNpI0kGicALwDHKGmo8sMqQPPS2uXAjLhf2vY5YDYYScOcxat6h/c fPG9fdMTaAGgCbRsmjXEWSS6qXJGPg/MzVhIH4FmiVBIGy0vObyiVOzlqLRnJYho4pheEg of4HB35h6bU6t4Vz8RGhTN4YpQ+wdEyxSzEfcnblku9zEfoWtYUq4vfmr6Yqbg== 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 4hvN9X39Bfz1KNR for ; Tue, 29 Sep 2026 15:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2788d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 15:57:36 +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: 49084ed8ecb5 - releng/14.4 - 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.4 X-Git-Reftype: branch X-Git-Commit: 49084ed8ecb5c58fb4e50f9523bea3721713ee91 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 15:57:36 +0000 Message-Id: <6abbdff0.2788d.79497641@gitrepo.freebsd.org> The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=49084ed8ecb5c58fb4e50f9523bea3721713ee91 commit 49084ed8ecb5c58fb4e50f9523bea3721713ee91 Author: Gordon Tetlow AuthorDate: 2026-09-27 22:05:27 +0000 Commit: Mark Johnston CommitDate: 2026-09-28 18:17:20 +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,