From nobody Tue Aug 25 16:01:21 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 4hTsw21r6Lz6pbrK for ; Tue, 25 Aug 2026 16:01:22 +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 4hTsw12mkVz44P0 for ; Tue, 25 Aug 2026 16:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787673681; 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=drGENZ62xiAAU62BjfY4PzE4VsM8D/Y7k0gcPexDmR0=; b=XSPDI+yrz4q2pV2YUPFSfX59MqBilpo0mlymRut/V+nelZizAhmWs2Yf+7/5BXLrYqjNN3 NmYEdtzi1gRcjRUz93l0qnFb4bajrj7DtOPESENi6cRO42A3hKnwieKQ6EWfx1lNtV3U+X elGHdeZh5tiLvGiHbGNF9r2NVFHNKamqhNXePheWBP5KrO4AMPUfAI7T07H4/0jKvJ3QYo Xr567CztOCroE/ZZtcBoTBE+1mifBpSoG0s24MdrqRbsM5SC90N/faxSGsRhdCNG+9Y+bs Lsq4NbO0hBgWO9vFbfp2wvIwcR9tYN6/RzYjpWonBaXmTM3yw2kvjpfx5segXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787673681; a=rsa-sha256; cv=none; b=tl3IG4XVDLYQS+EbmaSiLfezO2DjnbsnXsjr3KDHuJ+sjV+dqZJlB9YQTtlr8EUF5YKxM6 /5yMtsuRmw4tV+lNqi2/fbY8LhmnLF4b/wNifk66RgZStVpK4ZQ5m7CYWjo/GLZImnGAHf bv4NnYZQL+2P7pSval4YpJO35KywdoUeUPG7RoChxQBYj3A/h2A5ZC9wJNM1nFaofbkoRA 3vWt1llWvs7tJfdVLoO/eTCokDYudz0hlJjNm5HzbCgJIJPl5pu8pUpxAxhvLQ6NQLsyL/ KocoIanYyvS9VWsligbM7LdZ6Ni42FPz8Gm+q1QI+BPMhowIuorIeNraXLZBww== 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=1787673681; 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=drGENZ62xiAAU62BjfY4PzE4VsM8D/Y7k0gcPexDmR0=; b=dBZBIFHAP+j3rbVtF+CGQN2vLHZVst2ckQP8TkmzrgHJuRmAt/H7cg/V/E9PZSRMaKjxCB VPyHRHA9Gqo8/m5lcMcmjfkMDafPmMrFzylWPLOCVEpUXypwGyi642kMHwAcWdHpBsD+Ox bs6SlXACw2eHLgpJl9TUnRIAd0pxYSTh2aVPKwOI66HI1IzXRUxMLGvrMkfugWx6aEezV+ d6w8JYaGy4v4PRoUrFtrf4VlYY1CdP+H8jK2SWgTigX5Hfd/raRInQCmmNbFnvmi9v0bn/ f3Ru8ah800OiBEelq9Zg48ZwLKNGyyOZIErDT8jouEaTh+EiZaSvK2LscGogEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTsw11JDFzxWR for ; Tue, 25 Aug 2026 16:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33121 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Aug 2026 16:01:21 +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: cf7a1c605a9f - releng/15.1 - 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.1 X-Git-Reftype: branch X-Git-Commit: cf7a1c605a9fbf580c6d3853f6dd811f37a42d8a Auto-Submitted: auto-generated Date: Tue, 25 Aug 2026 16:01:21 +0000 Message-Id: <6a8dbc51.33121.177cb4b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cf7a1c605a9fbf580c6d3853f6dd811f37a42d8a commit cf7a1c605a9fbf580c6d3853f6dd811f37a42d8a Author: Gleb Smirnoff AuthorDate: 2025-10-15 20:01:25 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 19:33:49 +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 cd1795304b43..3b7048be5fec 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1569,15 +1569,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);