From nobody Wed Jul 8 17:01:24 2026 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 4gwPWS6RCMz6kWnC for ; Wed, 08 Jul 2026 17:01:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gwPWS5ZTWz43dd for ; Wed, 08 Jul 2026 17:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783530084; 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=2jvZA/kq9/L5jISJLBtdK262EJq6dO1R1mVvA1tC5rM=; b=rFustOrQb1n1DYxlbhG5BIF9IYJ9cHN/q6ent50MlU/5z8W3eb9QJ3es4aB4bKZihho+5K zo/QV4Z9/r3FXaHfWFDphHWWNu81GQcSmABC0g5TaFuehU12bdzd3Ry5nrKhaHpFciEA/h tKgBNfnQ5fyudIFS+NnF/jYXE9DxbZsqhGADH+8YDtlDQDJgUf2XUuUC9rquxiZsY6Xl/c q+P3YDPgmddDA2hr29uswfVQk22pW4RmQTxcYq3ZUz7BfpX3sn7RxbaiSsDPpdFeOHvUML 58DUgoCk5LvkBEbGydyDUnDjG38F7QU3CH8dgReKOGCipv2xGvtasQx6O8M88A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783530084; a=rsa-sha256; cv=none; b=Of1bW+oLMb8cArPgepyTu3F43hPJF+XVyshi/nlmwkpxetowmTfnhYVzZQd4mQUA7PoA2B +uWfhzCh5enRFK2LekneZOnMvbOhj9gIh2pfa2eYRyuGK9uDJgOaBt2Nusruj3C7VRnVxb pqLkJRjhxP+VlPNwkiZwvZwG3P6SYn6HlYm13tgz5+RGMWDQ0YEefdaMRqdG5T5CMW5Mt1 gZddEFz0B0QERNIpEYkarXWyNjOdQLRSKZJTfuVhZRBbS7nMWKLA3ZuayXgz/KZXTVxldx iSKwoiv/tKtDq9PkAa140wrjsbs/OCycUmoEqRoM00CfPRTQ54c/nMovOv5M7w== 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=1783530084; 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=2jvZA/kq9/L5jISJLBtdK262EJq6dO1R1mVvA1tC5rM=; b=T0H/LTVlvXSgq4yWG7IHy4hsY8PBt6lI7m+KXqH7n2YX6UTSEPC900IDkPZuYTD5atkNbH sU6cNFNIC6X6vHZCDvnZaBV5dLg5M1N5fNN+1Y2oh0mryxlO1Liv5I6bvaQ1OcdFsvM+lp j9BvKG60dtK+xKIgKwjjfuNY95AR9GsxsufnGSlTUFNW645ZeXcokLDEnmD6NlDGBQh+in 5UyYTCnRr48iaw8nfZS1mp1TJDU3BU80KjQIe9lPA+cEsVO52uujBWmmeXL6J/6zpsyK/A 3zwoCI8F3JichM5pIwHUPJ2kfxT1F0nsFMAhYmRzYWovhTXtAz5KkGXvHYNxnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwPWS4FVmzVsC for ; Wed, 08 Jul 2026 17:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32e05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Jul 2026 17:01:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b72397da275b - main - kern_filewrite(): unconditionally calculate cnt, it is used by callers 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 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b72397da275b098365532133688d555b842bad4f Auto-Submitted: auto-generated Date: Wed, 08 Jul 2026 17:01:24 +0000 Message-Id: <6a4e8264.32e05.2b37112e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b72397da275b098365532133688d555b842bad4f commit b72397da275b098365532133688d555b842bad4f Author: Konstantin Belousov AuthorDate: 2026-07-08 14:54:25 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-08 17:01:09 +0000 kern_filewrite(): unconditionally calculate cnt, it is used by callers Reported by: dhw, madpilot Tested by: dhw Sponsored by: The FreeBSD Foundation MFC after: 1 week Fixes: dfad790c8cca ("sendfile: stop abusing kern_writev()") --- sys/kern/sys_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 079bd7b347d7..d5145d6cf322 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -595,9 +595,9 @@ kern_filewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, #endif cnt = auio->uio_resid; error = fo_write(fp, auio, td->td_ucred, flags, td); + cnt -= auio->uio_resid; #ifdef KTRACE if (ktruio != NULL) { - cnt -= auio->uio_resid; if (error == 0) ktruio->uio_resid = cnt; ktrgenio(fd, UIO_WRITE, ktruio, error);