From nobody Mon Aug 24 16:29:46 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 4hTGbH1m8qz6pbMD for ; Mon, 24 Aug 2026 16:29:47 +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 4hTGbG5XLnz40nF for ; Mon, 24 Aug 2026 16:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787588986; 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=oeED1bvMH/4yXrYjNAh+pox68Tz6twLKs+GqALov20g=; b=h9cvrfj4I6kCDu8OnAevf2S2ZVwKak6PyzUHKSukHTaA3MoE0Ks0bBMyseQcXs/uKT7PNt 5s5IjTNrVGKd5HkbFcQuc2sYH2t8ltt/yryQDaw51bymIWplJS1UbeLPlyInlyhVoM7UU/ mlNWgO6RXD5MBTXsBKEhN0vq4TE/Zxd4napTGNLNgRlwKseMrB4s6dv6e7v3JVj8MoOS9z egzeCgBrFREm7lnzT8DX1SSl8zPwtQSi52PqH51Jo/VdyA5IrlcFX3NImt/k/KovpVhUCZ NqkGpS0HGc7S650Gj+utYkGzLzlq8uUZIwJ7M87N/vP66sKnFI4//sDmY+7Uzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787588986; a=rsa-sha256; cv=none; b=ve3iQQbFhoUhWdhFaiDvjA+0nXkOY/GY9MIunsVt0QmihqjWvcBNhCOtOM0Mlq9fxEm/3s yRwDgij2ouKPJryDpy6ULinJyBjT96+TODeehUgHtEHsUnL8+p6I7lepDo7Ue/PlEwXvsT Pb576m4uXIjkdJeee1iX80ber2arr2DM6cNU5fXOXmqGdhzUM3D4Kr6IkQwNuL3HJsY3ME nWm/v4f0Vl5RlgOvf9sd9B8RKWYIWd9LVaVzIylbhheqgOjiBWKZ76PA6d7IgRRaGJAwrL FMIWsQdVPTFv2lNrjERWQCKUc0wDp7HGPL0aX0JrI24ExsVd/dsclmLwdjggbQ== 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=1787588986; 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=oeED1bvMH/4yXrYjNAh+pox68Tz6twLKs+GqALov20g=; b=aWFvvGZ6plJqn51eaF0yA7kMFsiBJgLf0NCBH74aam7aRlVsrEzyFdaKh3m4wnmeJQeMhi T8dTFCCyLJC60nWiuXSjWtV2hBjK2u/om0EBqbCG9xJhG2Um3j1BEvcXSYMyJEm15sGeof rGc9tfgTIc2BAUDm1V+nWkEe+DiNePP4ST2Z0x6+YXqcCLbYpAXVm2Eezk0upESe3yfEtu jo3TnhJMID98kdUzHF6RoSbXC+CTs4gHgWhDdwUs2wOzrR1vPDPdtGDjTdRO7KX5VJBR4S FCciQjOhRsbJlynVMWFet6q5qJnpBxFzigaH0mOQFDTnkI8nXlwbd+DaYYCYJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTGbG4JrRz1BVj for ; Mon, 24 Aug 2026 16:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 222a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 16:29:46 +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: e7070407aa8e - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: e7070407aa8eae85bc412b9fd80865628b69f22d Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 16:29:46 +0000 Message-Id: <6a8c717a.222a2.7f2fbb@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e7070407aa8eae85bc412b9fd80865628b69f22d commit e7070407aa8eae85bc412b9fd80865628b69f22d Author: Gleb Smirnoff AuthorDate: 2025-10-15 20:01:25 +0000 Commit: Mark Johnston CommitDate: 2026-08-24 15:17:54 +0000 unix/stream: plug a corner case when control externalization failed while peer has closed its end. Reported by: syzbot+ffcc3612ea266e36604e@syzkaller.appspotmail.com (cherry picked from commit 4548b9f3a8167a340a5086ed51a76d932c9ab3cc) --- 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 878aa46dd7cb..42b2e33556bb 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1556,15 +1556,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);