From nobody Wed Oct 15 20:47:21 2025 X-Original-To: dev-commits-src-main@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 4cn36x6fWkz6CyZ9; Wed, 15 Oct 2025 20:47:21 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cn36x624tz3JYb; Wed, 15 Oct 2025 20:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760561241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y3AGtT3snXw0nZkE1gwmUVhls5U/4yF4tAtLLlgO68Q=; b=gE82HyRrXMDZDUlOdLwGm8HC81SQIa8oGBB2cmbCn4AgVKz4K/w4xQEOn2mKDpwXiX39Md JJ2mzEs2y/iAZCk1uaBQ7N9tPB5jf83Ss9ul3lQluKOO4zH5lhRM2o3ujth9iPiZEeu4mc ILLSAqW5GuJZ9AtXcbESRYTTolhugoMmn2qOuHgFDJ3ejkPj5/Pe10c5PI32d2eBbBmKMm xfruYbWNRGIJDnx8bzTE4z2OVAhsJVUVXDgvdhlszeEhJJc9p4Y/q9XFSLa6+eljVAzHFb nWprSEEeD1LhMPw9gsIPwv0oaBVL/vBFheAoCJb0gmv785hohvKsjzBc3vQOhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760561241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y3AGtT3snXw0nZkE1gwmUVhls5U/4yF4tAtLLlgO68Q=; b=QCBTzKIRGuErDBzTnRhZNN24LgPHlz11eaklyxIucAMTazXst3gSU7em7aupdMW9F7ml7y wm1zpl8n9mb6gnXIrSRQec2Yb+wO5iMiP2U+jTXqHDWTETMxnjFrqq3EEisschKhuER5FN T3RjYBHTSRniloEai7ULm5JSpzw4uqQGe8rEJSgtAYe3KBadcVl4YqBcG+706x1DslDwo/ SpcdTcyIz/D8zuPPiQeLmSAOEaJ70W7sFcKv2tk23Xd4/QJegcJWll1+HUWDH7+x1NqXeh Mnyv0pBqPKtDPBYMl28dSkLY4N1mvTDF6CIKXsBVwlxSxqWpBSZbOAqnHM+MXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760561241; a=rsa-sha256; cv=none; b=tyE50L/iAjqqiJwSgBn7kNvteN9dx1WKxzihzSD3sX4iCws8pBkOy/FH8b+TQkoG9GlpTz ifx+wycELANwasgZCTzf3o4kKGl7dTpmS7+Ln4RZsZblU737U+uzaTanRpiRG8W3Mwqj/v 3VxCew3guCe7dcROfqcI7R6CoEXuQFhwKbwWAOI8JcLPpqd7Nmz856fn7f1lxFL9J4kU7L Ufd/G1zrVPFCqR9a8r9PZDtx9m4VACp75/k4BSRecc/yVnZ0Z6bgGhrfymSPF69G5CaoSw NavyaF/GEy0UoQsqln6vBHpKryEtYZx16PBtAu9njocicL4IW6/aNhfMvaVgOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cn36x5VhVzv4M; Wed, 15 Oct 2025 20:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59FKlL4h081754; Wed, 15 Oct 2025 20:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FKlL5b081751; Wed, 15 Oct 2025 20:47:21 GMT (envelope-from git) Date: Wed, 15 Oct 2025 20:47:21 GMT Message-Id: <202510152047.59FKlL5b081751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4548b9f3a816 - main - unix/stream: plug a corner case when control externalization failed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4548b9f3a8167a340a5086ed51a76d932c9ab3cc Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4548b9f3a8167a340a5086ed51a76d932c9ab3cc commit 4548b9f3a8167a340a5086ed51a76d932c9ab3cc Author: Gleb Smirnoff AuthorDate: 2025-10-15 20:01:25 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-15 20:47:11 +0000 unix/stream: plug a corner case when control externalization failed while peer has closed its end. Reported by: syzbot+ffcc3612ea266e36604e@syzkaller.appspotmail.com --- 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 c5fc1e84ce3f..90489e99491a 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1559,15 +1559,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);