From nobody Thu Oct 16 13:18:47 2025 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 4cnT702nfsz6CSq6 for ; Thu, 16 Oct 2025 13:18:52 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnT700sfMz41f7 for ; Thu, 16 Oct 2025 13:18:52 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-86420079b01so132104485a.1 for ; Thu, 16 Oct 2025 06:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760620730; x=1761225530; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=9duhlw8kO4YmZObNm0h9zJvyI28hB1WqBQjw7HJhx10=; b=ch0IDIYp0o2x/5jFX2szqpprK8CQUhkYA3RYkfhKOCFJyKTWrOYeAnVTt4czT/6GBb WJpjVBVegXM4fMBslujhwlBjQQuLJ1LkaUzu6kS0fuT5xeTJIsbafcXTZ8UAdAhtN0tO VDaHnLgb9V83qcmtlBaImX/9kxESlvev817jm1fkecupYMP8iO4cyZN6mw3dcrPFgyo3 EAsElWIxVDeDkC88/fwAbH7NCrf7Tii9ADGcztgSTOWwvCuFhq7O/8asdAt/cFZr2PSs FzaXbc1BzNPAdrcxj6np97DaVuiPG2zcXl9S2DgFc8r7ZjZ8g0iPV2B+gkBJXhxopcR7 Z56w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760620730; x=1761225530; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9duhlw8kO4YmZObNm0h9zJvyI28hB1WqBQjw7HJhx10=; b=F2v7SlAnNw1QTeLifSfWHezuqz50nAi4KZlOzdDBSf0i9gQaCx5FwwpyWPh3pR7m/T XTHxw3XrEJLBR6oXIo2Y1b6TIVnbRl0AD61b9HVrdUwkVvK1xMTNQDn/MDXTOlg4hQVQ yBuwUcrsyIRoeZYqggQnJfy27fbNEOyt0aWWqk92Bp49xYOlAQqZOzwxyp2C70KN5Zhq 298aIWol7LyA8h39q/870s47yqGnat/8+uVXalFxezRAVSWftBeM4jzCjUNrYFZMvKp0 XtoVMk6hywqK5Bjb9brHMtgnfRs/kvPAKnIOiBZjF6aBV2VzHiaKgml6yFDqJXLLpopn Ramw== X-Forwarded-Encrypted: i=1; AJvYcCWl/KiMFvos/HZw7CAQ5LcL+42YWZD1RgZl4HKmYtozmBt+OsJtSxp0ibTPRlBzyhHLuSGUo58Yt3zKrHI+1p6+WNWw@freebsd.org X-Gm-Message-State: AOJu0YzZUhIqyhvx/HNjr1JKk3S1uwCS4FqEeoTcYUmSNsq0tQlzolh8 5XVXWO1K9a4MUOEbdRD1pSnHqTTGHEbQbmbengMM22pmV+StiXP5JrLp X-Gm-Gg: ASbGncupyExKvHMZ1PwrKckOIzm/qqADEpU78scVzK9DzfVI/P0wYjJAH7DY5h464O4 /izZGVp2o4NHQLgUGcX/O0BUz/6zyVXHm0ylMz0U/BQYYdV7tEDUxkeZ6t1Dx60fvNiGQPiHIdd GjhBw0o104AWV6uQCaofXJbIrVbirqjx3cp48JmMkk7A6cigeLVmAbsk2CC9DFPyAcN3HBDnxfM prfedqOULIMcSt5BuK33jSHt/UerACMSwsjB7vsJXPgh/6tGkoZiHV3ngjpAI+kWEZ5jQn3bkpI F9mOZM6fdXt6eH1U7fwVFmDnevzppDT67ODW+0gEFc0WxbWWOTulPI0/5f8DG+H5Sv/DWAWmVv7 brSsPaEXwy6xPLoU2o+f4qOD85eCPZM8Kb7RLPgsa54Zc6ugS3qMNGfNGJW1UP9PWoLbmu7B6Gc m4yHEUN8v48zlAuHc203anxsKa X-Google-Smtp-Source: AGHT+IFZw5n0IZKOUuifBwb1+SYJHwPZcEMvzdpFvIab6VtQiB2tWZmc+esrcDViAWhxzXUmF7SbIA== X-Received: by 2002:ac8:5910:0:b0:4e8:9596:ee77 with SMTP id d75a77b69052e-4e89d1eca83mr1440151cf.10.1760620730118; Thu, 16 Oct 2025 06:18:50 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-87c012b5de7sm39310066d6.65.2025.10.16.06.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Oct 2025 06:18:49 -0700 (PDT) Date: Thu, 16 Oct 2025 09:18:47 -0400 From: Mark Johnston To: Gleb Smirnoff Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4548b9f3a816 - main - unix/stream: plug a corner case when control externalization failed Message-ID: References: <202510152047.59FKlL5b081751@gitrepo.freebsd.org> 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 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202510152047.59FKlL5b081751@gitrepo.freebsd.org> X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cnT700sfMz41f7 On Wed, Oct 15, 2025 at 08:47:21PM +0000, Gleb Smirnoff wrote: > 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 Shouldn't this be MFCed? Could you please be sure to add Fixes tags to such commits? It becomes much easier to find missing MFCs with that metadata available. A few of us have discussed using git notes to encode such info after the fact, but this is not available yet. > --- > 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);