From nobody Thu May 22 21:50:00 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 4b3MQc6Kvcz5vyyw; Thu, 22 May 2025 21:50:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3MQc3XVFz4FLb; Thu, 22 May 2025 21:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747950600; 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=jV4sm67KBGC330ohhpoXWs0MbBXm0t2WfK/aqZ8msIU=; b=PY8S1L5p5DwuMcCfSAQ8+amN9bUHj3ZMMweo0Y+s+GevFHFWW0Yu8ZU+nQ+pwHnAJ6xzOG Axb2vDHdOg0H3jbyDz996EkdYFMY7MiYMptnFgEi0QibsDyzP/Mvf8YpF6hv+ZD0bwAIcy ICsNMnLb4qVKxmoR2j5jkzdbxdVJDZi1AU2DdxX4w2iy1847MqwmdfDMrTaL/q/9Oe86pw k6LqT4R6jxNvM/QkG0pTFnvGE2Iclh2J/gjggWWXtW44a6VVVYoMRhcOYStfEkcxo6oyWW uFIqx1A+2OZARqRYjvuohmoutCE0ESTcO+28aWg5PjAriH/lJ5HRIP3gkZ5J2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747950600; 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=jV4sm67KBGC330ohhpoXWs0MbBXm0t2WfK/aqZ8msIU=; b=xRfb1EN8+PSECPCDyAKZG87n11R+cmfhGXCvNETuwrrJAbmGhlqKLpx+rj0dwpcpZ2ZzS2 Sx4Fff5YEIaprnSOImNma6bxolGnN607FOq49CuSPKc4RPhxILozb0XFPBsDgnj10Ssohs eiLgUBmXe3rKEsujmASELuDmKCI+xkqLNsNWe/ITXd4vrqJBRttpqV+PLhQMGfCYh8fbei ooW2CrTwUBG/0N+o6Qt2jW+XzgPcawnKTgg05xQcfiDMHnFpvzPLyJ7BsnH+gF6It/kPAX 1gOKhFXWwaDM+MdXzZYPtFOwntPG4Yh+gE24Cq9jk+aQMqW2XSLpitzQzXnfHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747950600; a=rsa-sha256; cv=none; b=JRM9i6/MGM7bnjjQ+CzoB74PV2BTEwCZq2TFup3lxMDxsmF7/Nf/UKO8CEfwcGYtyYVf+L ZffGTL39kcZ2nqY2fTwbL5cNN1BHWxRCrprdtOH/jgF91loxb7lxhiYWAtWDqesD09wKFN oNTeAtAb+kIUEINDSkzGtLNVRs4mL9u4AqCiXZj0zUibK/orIX1TWO24bBp8r+HIZ0/7Sf OOBQ1SYpiev2o+zVDJ3oAhX9t+X6htt6Ytfkc5IN2ji2BdJJJAif8mx2kUFotDk29waQpF lCr5h869Xc+7O4ZONl9rs4tU8Aj3FapqvDlwDqyM87KBsFzUcbaF12f8pUxJfA== 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 4b3MQc2KZrzf1m; Thu, 22 May 2025 21:50:00 +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 54MLo0ug023482; Thu, 22 May 2025 21:50:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MLo0Dw023479; Thu, 22 May 2025 21:50:00 GMT (envelope-from git) Date: Thu, 22 May 2025 21:50:00 GMT Message-Id: <202505222150.54MLo0Dw023479@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: 4814de3243e0 - main - unix/stream: fix bugs in sendfile(2) operation 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=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: 4814de3243e091c48453b4fd6c818437ac1985f7 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4814de3243e091c48453b4fd6c818437ac1985f7 commit 4814de3243e091c48453b4fd6c818437ac1985f7 Author: Gleb Smirnoff AuthorDate: 2025-05-22 21:47:41 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-22 21:49:37 +0000 unix/stream: fix bugs in sendfile(2) operation - In send(2) don't update sb_acc if appending behind uxst_fnrdy - In recv(2) don't read beyond uxst_fnrdy - In the debug code allow ready, but blocked mbufs beyond uxst_fnrdy --- sys/kern/uipc_usrreq.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 164030eec7ab..3181868175a8 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1012,7 +1012,7 @@ uipc_stream_sbcheck(struct sockbuf *sb) if (d == sb->uxst_fnrdy) notready = true; if (notready) - MPASS(d->m_flags & M_NOTREADY); + MPASS(d->m_flags & (M_NOTREADY|M_BLOCKED)); if (d->m_type == MT_CONTROL) dctl += d->m_len; else if (d->m_type == MT_DATA) { @@ -1246,7 +1246,8 @@ restart: cmc.mc_len = 0; } sent += mc.mc_len; - sb->sb_acc += mc.mc_len; + if (sb->uxst_fnrdy == NULL) + sb->sb_acc += mc.mc_len; sb->sb_ccc += mc.mc_len; sb->sb_mbcnt += mc.mc_mlen; STAILQ_CONCAT(&sb->uxst_mbq, &mc.mc_q); @@ -1397,11 +1398,13 @@ restart: * last == NULL - socket to be flushed * last != NULL * lastlen > last->m_len - uio to be filled, last to be adjusted - * lastlen == 0 - MT_CONTROL or M_EOR encountered + * lastlen == 0 - MT_CONTROL, M_EOR or M_NOTREADY encountered */ space = uio->uio_resid; datalen = 0; - for (m = first, last = NULL; m != NULL; m = STAILQ_NEXT(m, m_stailq)) { + for (m = first, last = sb->uxst_fnrdy, lastlen = 0; + m != sb->uxst_fnrdy; + m = STAILQ_NEXT(m, m_stailq)) { if (m->m_type != MT_DATA) { last = m; lastlen = 0;