From nobody Mon Jul 20 20:53:26 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 4h3t5g1vtgz6dQ5c for ; Mon, 20 Jul 2026 20:53:27 +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 4h3t5f4Mkrz46tp for ; Mon, 20 Jul 2026 20:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784580806; 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=qokoI9fn9fKy/HWh0SPpw8epwAvqtatWqE5Dnl7abxQ=; b=C3zyp/b/Oh0LMMEUEi8j1JTeH8dzFBS8xGts/AiidFxnZZ/NPut9ykvPwVRTShwQY6jLbS AbFeX6e2ecHgzruZRmM29OFh5UGbcNzh4NFXrZXNlRGHd0Xy/gBXdDFoY9W2wtTMJoWE/B Vc1dY6i0gm2bKWJ80d4Kb8mX/xmcRMZFv3kZSSA0k75/Tz2n4Mqob+1zjluJha8+VJzM/q 5eCg6w51rX/RLjwbd1SM61GgdkRtfx/51UVysDgUCknoD+qPdFHFf3/QaHYI/0EIf47n4L wO06Uu/q9KtXbIQ31PJYO4VtsIuL1d7jYir/FnXADICsmh99luBaD/jZ3uClGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784580806; a=rsa-sha256; cv=none; b=m4b/+4Y8AuLWPtmn7xdkPMPJXQhs/LtsU6vnyWhs0ea2s2HazA7hxRVshe+BLs4vdGruKS OdwYdfUckN7ocFnmerWF4QMSoPPWmxm5R78XZFHmXIDdtUJfJMtO1Gstqfe0E4iMAbELCt fhc0O8nqs9/XU6NXtr5whHgSVHYbq7+4SKnxcnq+pQyHoo01wCcuH4CVS6yJViNl9dbUSv DUHPWej2M6ATuXGv9MzVbLtvctQa1WNaGxt37rgp3FZybKpebbGFVs1N3KvNofVDBuCIHj UM1F5aFLAo18HsSd1XCG1zJx3CNXQXBLFgoaQ5gj0I/GeZ62F0hSF9dBTIgKNA== 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=1784580806; 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=qokoI9fn9fKy/HWh0SPpw8epwAvqtatWqE5Dnl7abxQ=; b=yuGmWbUz3pIvTiRfNCIqGHKdNxrJamiWOqadbhQDG9efKLia2kj0Amf76lrKD1dOVXFbNr vXkZ7INaQk9rcUhkVC9apuGy87JSDy2zMSR7z6AbRouPDd2l756Ao9hsCIjq2Ivu429Vk2 7M1dsvnKvjQ/7RPEjzxGLvbhj0Ie/ybaUwBIDpd6plh4EJyNh6HuCDbh5u8dTPyXyK11Zv xkNOZ+zLoJQ6GonZ0kQd2032DUMylcpwICSlmEcUg3GQ+HE3ClL0TJyRQ0arGUUT6ka5Rm Y6Torbk6lafXkZTEb5jQ09g4bTWHQHHWO41zCLVQGpGSKtCBWs4c+zUTtgzsVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3t5f2nkYz3ZG for ; Mon, 20 Jul 2026 20:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c44d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 20:53:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fcee136ce056 - stable/15 - kern_writefile(): fix several regressions 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fcee136ce0569314a07835171afb115081e1f0fa Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 20:53:26 +0000 Message-Id: <6a5e8ac6.1c44d.5a7dd01c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fcee136ce0569314a07835171afb115081e1f0fa commit fcee136ce0569314a07835171afb115081e1f0fa Author: Konstantin Belousov AuthorDate: 2026-07-08 19:21:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-20 20:26:04 +0000 kern_writefile(): fix several regressions (cherry picked from commit 1364d8fd9b25d6d3e9618e7be073a1a1b41aa19c) --- sys/kern/kern_sendfile.c | 8 ++------ sys/kern/sys_generic.c | 6 +++--- sys/sys/syscallsubr.h | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 9d08f9626d45..a64024cdafe3 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -1232,8 +1232,7 @@ prepend_header: SOCK_IO_SEND_UNLOCK(so); CURVNET_RESTORE(); - error = kern_filewrite(td, sockfd, sock_fp, trl_uio, - (off_t)-1, 0, &cnt); + error = kern_filewrite(td, sockfd, sock_fp, trl_uio, 0, &cnt); if (error == 0) sbytes += cnt; goto out; @@ -1325,10 +1324,7 @@ sendfile(struct thread *td, struct sendfile_args *uap, int compat) &trl_uio); if (error != 0) goto out; - if (trl_uio->uio_rw != UIO_WRITE) { - error = EINVAL; - goto out; - } + trl_uio->uio_rw = UIO_WRITE; trl_uio->uio_td = td; } } diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index cfc3b6f88c34..1b88581714d2 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -555,7 +555,7 @@ dofilewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, auio->uio_rw = UIO_WRITE; auio->uio_td = td; auio->uio_offset = offset; - error = kern_filewrite(td, fd, fp, auio, offset, flags, &cnt); + error = kern_filewrite(td, fd, fp, auio, flags, &cnt); /* * Handle short writes and generate SIGPIPE if needed. @@ -563,7 +563,7 @@ dofilewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, * see sousrsend(). */ if (error != 0 && fp->f_type != DTYPE_SOCKET) { - if (auio->uio_resid != cnt && (error == ERESTART || + if (cnt != 0 && (error == ERESTART || error == EINTR || error == EWOULDBLOCK)) error = 0; if (error == EPIPE) { @@ -584,7 +584,7 @@ dofilewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, */ int kern_filewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, - off_t offset, int flags, ssize_t *cntp) + int flags, ssize_t *cntp) { ssize_t cnt; int error; diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 439edb427ada..164b3d874cf6 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -173,7 +173,7 @@ int kern_fhopen(struct thread *td, const struct fhandle *u_fhp, int flags); int kern_fhstat(struct thread *td, fhandle_t fh, struct stat *buf); int kern_fhstatfs(struct thread *td, fhandle_t fh, struct statfs *buf); int kern_filewrite(struct thread *td, int fd, struct file *fp, - struct uio *auio, off_t offset, int flags, ssize_t *cntp); + struct uio *auio, int flags, ssize_t *cntp); int kern_fpathconf(struct thread *td, int fd, int name, long *valuep); int kern_freebsd11_getfsstat(struct thread *td, struct freebsd11_statfs *ubuf, long bufsize, int mode);