From nobody Tue Aug 25 16:01:00 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 4hTsvd1Nghz6pbTL for ; Tue, 25 Aug 2026 16:01:01 +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 4hTsvc6FxRz43yB for ; Tue, 25 Aug 2026 16:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673660; 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=bMXufI2Lv6bsfYk2BVaNQyKNKWSqFbdFRfhRBLAvVIk=; b=cIcUh2h1mSHgyZPU3nUVxjcbAAcaixtWIqyHtvUzfcwpUydfud1PaGxVOXXMKD393q15by 3UFYtOjkZqi9Z9NHSJuvSBk+Q2DpKUJCmoYDW3VFfylTlTxMWgmDXCwCP7kaxa/YntIm6K YlUhQs+MkUs26u/czAuLxCOMYlurcByAesVrV1cJz1eE/n+0c0r1UWfauFZ1y6pdksBkY1 26VAGVmHFfTm+EdkPPX92UP3q2y9h+D/G3JrnuVvQ2sCGFuBTe1poFLG6dBg8crWu7Aq4n hws2dvHnnDPEHmq3NbAKwYQ5CklCZWsZllKNMMrXfaf6NUdNj1glSmCYQOFqkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673660; a=rsa-sha256; cv=none; b=EZElVvPLYwB04Ooiqv+PshtsZfkfS2dsqiuBu54qNrmwokMx/W4WvTecGoKueaH4ayhzPj BnpJlX2qIzj4P24psB6O7aQ3Y6RCVGVB9etCuhzOqHk2FFwxMXFAXHBpawz4KGX7U0G6rp 2c6SIsgnF+fSPP+qps43inawAbUTWYu0SrtV7jLdwZBpMyAevk7Ay6ClDGfAJsWrbkKEgC vpoFGwhbuYssZxwHER4JOv+bA+uEgFN5Q2L5y5OoGOtoZnEm6s1gvBIXGnM5Aa2b0l3bLA sTvZZBGk1DaBmNQ6UvFc2rkW9M2KZTx3lWpJqeKpIOMq0pYuciIdwkLZf6T4GA== 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=1787673660; 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=bMXufI2Lv6bsfYk2BVaNQyKNKWSqFbdFRfhRBLAvVIk=; b=qpimlW95GhrzoK3aIvi3lSP0i6XsLIZw+sgyNosJcrUhOl+5SvcAoGRKX0OJsXt5f9HHRG 9F+40yiFBNO2iHffJn1mKqVIdR9F0xDamvPvmM5AsD2LerlGwCuyj44D40jSDzvfejNmd1 cVIyxOUEzi9y9fMajtlAv4SPd6MCYlDX+ZhMgeXUEHA+h0Txulsku5ekIfADcJurTmOd4g tbAmgo4lazLZay4oeaT0ljBFvCN9k8gEzp7CVYeXqOHgb8jGI7Seu0n8mNaYEghoNs3HG+ eb1psE3LtEDQzIATU9zjwXURD/Nt3u1q8NH5lzfYwHe0ZCCflnrCn2FgMVz3eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsvc4mNLzy8K for ; Tue, 25 Aug 2026 16:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 331c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Mark Johnston Subject: git: eff554d9f3d6 - releng/15.0 - unix/stream: plug a corner case when control externalization failed 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/15.0 X-Git-Reftype: branch X-Git-Commit: eff554d9f3d6372c9cbb8ea315f910b81bd44eee Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:00 +0000 Message-Id: <6a8dbc3c.331c1.4907d092@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eff554d9f3d6372c9cbb8ea315f910b81bd44eee commit eff554d9f3d6372c9cbb8ea315f910b81bd44eee Author: Gleb Smirnoff AuthorDate: 2025-10-15 20:01:25 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 19:29:47 +0000 unix/stream: plug a corner case when control externalization failed while peer has closed its end. Approved by: so Security: FreeBSD-SA-26:57.unix Reported by: syzbot+ffcc3612ea266e36604e@syzkaller.appspotmail.com (cherry picked from commit 4548b9f3a8167a340a5086ed51a76d932c9ab3cc) (cherry picked from commit e7070407aa8eae85bc412b9fd80865628b69f22d) --- sys/kern/uipc_usrreq.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index ecf7218f2ca3..932bda8b568d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1552,15 +1552,19 @@ restart: mc_init_m(&cmc, control); SOCK_RECVBUF_LOCK(so); - MPASS(!(sb->sb_state & SBS_CANTRCVMORE)); - - if (__predict_false(cmc.mc_len + sb->sb_ccc + - sb->sb_ctl > sb->sb_hiwat)) { + if (__predict_false( + (sb->sb_state & SBS_CANTRCVMORE) || + cmc.mc_len + sb->sb_ccc + sb->sb_ctl > + sb->sb_hiwat)) { /* - * Too bad, while unp_externalize() was - * failing, the other side had filled - * the buffer and we can't prepend data - * back. Losing data! + * While the lock was dropped and we + * were failing in unp_externalize(), + * the peer could has a) disconnected, + * b) filled the buffer so that we + * can't prepend data back. + * These are two edge conditions that + * we just can't handle, so lose the + * data and return the error. */ SOCK_RECVBUF_UNLOCK(so); SOCK_IO_RECV_UNLOCK(so);