From nobody Sat Sep 24 16:42:31 2022 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 4MZZZ01RTBz4d3B9; Sat, 24 Sep 2022 16:42:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MZZYz6wn4z3GQ4; Sat, 24 Sep 2022 16:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664037752; 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=+qLjlg0Lt33LzpFuw5XFomBHfvK8LM51TAl/nL76fKM=; b=xU/zenH1vhrzUbhtTvXqNsiq+t56wQPRnM1gdEYdv60RJzxAyyJ8oV5ddBV2gRvLzWK7fr txokxN7QO8FrU3e6858Ie8cRB/qzOWefRw5FkD/nQSwJrzzw1sYoZ3Phk2rp7y3aMqnJCm smCcdTImMaWIvDCglNu5Jt/fe+15n+/rjQ5fg4nAF/zWp1SO/iJZKTodv0lmDT9HbTY/xN cyP37PUkIxxM2hzOcEP0I5h19ABmLCFdfmRW1qfL7xFUnsb8qSi50WIm2sxz5oSIzSB3qy 2+VwNKLRpptKgrFz3YWUpj8MOc5xATSh+YB3SHO8uGVXRTq04EB/eN4i/RfYvw== 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 4MZZYz5yZ9z17sG; Sat, 24 Sep 2022 16:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28OGgV5p058005; Sat, 24 Sep 2022 16:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28OGgV9W058004; Sat, 24 Sep 2022 16:42:31 GMT (envelope-from git) Date: Sat, 24 Sep 2022 16:42:31 GMT Message-Id: <202209241642.28OGgV9W058004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cc65a412ae22 - main - filesystems: return error from vn_rlimit_fsize() instead of EFBIG 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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: cc65a412ae226136e6207bdc8db4722dab99982f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664037752; 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=+qLjlg0Lt33LzpFuw5XFomBHfvK8LM51TAl/nL76fKM=; b=EXYAQghV484GrQ0Lc1ekXTQIhzSBEGT8124chyINcZU+w8yEoTHLnHGVCVe6A5YbxssdiU sW3srbDVyclBJDkWlkkchpYi2HLXz5NGcNESsFrVXTu/zu3bDWZGl9j2oj260gH4Hmk/u+ UsoCSxlYJstdchkV/DyigDLnSwZKHLMnhdXBOlVtMQCoB028rJcu+XVeucDbMelafSwHgL uMO5SYtMg4nF0lfvy8PLvcyf6d1C+Yn7Uefmm3LwSlJ4rb72txSF+R9/9uouFy0gy29KYB 0oxhL+rqObOSwpX0GNeI40h05gXB927UMA7wHx9/sov731Bf5OtvJhkXoyzM3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664037752; a=rsa-sha256; cv=none; b=VgecZu8Q94LpEvNtj2lDahKnJNls7iVX0g42GMjr9jyv36exMxP2M1Q0L9XgTcfgYnGoMm aNWer5qZVP3FDlZdMKAy7ybI1Zc78mORWCz0vIkGLi1tnqBvPQqE1RwUetwUapuQMsQVDh ERnARy1SFnfPOZdSbCco0TaCfpsxAHCkDQOx6+Vv6xD2Tt8PtcolO/SFuje3TaCqm9hgCO BBBVlPs19eYcz8LFzFW7wIZ/b+GPiopZaKYmbAzg2a3K1I+8l5AWMhv5Zgw+jeuzwkQq2W /NjatWn9a6MrX6IMBXoqe4+2AM5vPdcJq8ps9VUf1zPIoBhmlCiK37m0pF1TyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cc65a412ae226136e6207bdc8db4722dab99982f commit cc65a412ae226136e6207bdc8db4722dab99982f Author: Konstantin Belousov AuthorDate: 2022-09-18 14:44:49 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-24 16:41:14 +0000 filesystems: return error from vn_rlimit_fsize() instead of EFBIG Reviewed by: asomers, jah, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D36625 --- sys/fs/ext2fs/ext2_vnops.c | 5 +++-- sys/fs/fuse/fuse_io.c | 10 ++++++---- sys/fs/msdosfs/msdosfs_vnops.c | 5 +++-- sys/fs/nfsclient/nfs_clbio.c | 5 +++-- sys/fs/smbfs/smbfs_io.c | 5 +++-- sys/fs/tmpfs/tmpfs_vnops.c | 6 ++++-- sys/kern/vfs_vnops.c | 2 -- sys/ufs/ffs/ffs_vnops.c | 5 +++-- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c index b629ddefcd1a..5948cbd052e3 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -2207,8 +2207,9 @@ ext2_write(struct vop_write_args *ap) * Maybe this should be above the vnode op call, but so long as * file servers have no limits, I don't think it matters. */ - if (vn_rlimit_fsize(vp, uio, uio->uio_td)) - return (EFBIG); + error = vn_rlimit_fsize(vp, uio, uio->uio_td); + if (error != 0) + return (error); resid = uio->uio_resid; osize = ip->i_size; diff --git a/sys/fs/fuse/fuse_io.c b/sys/fs/fuse/fuse_io.c index 9ef4badfcdff..252fabb1c7d6 100644 --- a/sys/fs/fuse/fuse_io.c +++ b/sys/fs/fuse/fuse_io.c @@ -338,8 +338,9 @@ fuse_write_directbackend(struct vnode *vp, struct uio *uio, if (ioflag & IO_APPEND) uio_setoffset(uio, filesize); - if (vn_rlimit_fsize(vp, uio, uio->uio_td)) - return (EFBIG); + err = vn_rlimit_fsize(vp, uio, uio->uio_td); + if (err != 0) + return (err); fdisp_init(&fdi, 0); @@ -493,8 +494,9 @@ fuse_write_biobackend(struct vnode *vp, struct uio *uio, if (ioflag & IO_APPEND) uio_setoffset(uio, filesize); - if (vn_rlimit_fsize(vp, uio, uio->uio_td)) - return (EFBIG); + err = vn_rlimit_fsize(vp, uio, uio->uio_td); + if (err != 0) + return (err); do { bool direct_append, extending; diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index f5a07cd5f492..8573db682698 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -663,8 +663,9 @@ msdosfs_write(struct vop_write_args *ap) /* * If they've exceeded their filesize limit, tell them about it. */ - if (vn_rlimit_fsize(vp, uio, uio->uio_td)) - return (EFBIG); + error = vn_rlimit_fsize(vp, uio, uio->uio_td); + if (error != 0) + return (error); /* * If the offset we are starting the write at is beyond the end of diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index c89d6796ea00..54943bcdf68b 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -1034,8 +1034,9 @@ ncl_write(struct vop_write_args *ap) * Maybe this should be above the vnode op call, but so long as * file servers have no limits, i don't think it matters */ - if (vn_rlimit_fsize(vp, uio, td)) - return (EFBIG); + error = vn_rlimit_fsize(vp, uio, td); + if (error != 0) + return (error); save2 = curthread_pflags2_set(TDP2_SBPAGES); biosize = vp->v_bufobj.bo_bsize; diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index dd12d1276438..f92fe50ccd99 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -285,8 +285,9 @@ smbfs_writevnode(struct vnode *vp, struct uio *uiop, if (uiop->uio_resid == 0) return 0; - if (vn_rlimit_fsize(vp, uiop, td)) - return (EFBIG); + error = vn_rlimit_fsize(vp, uiop, td); + if (error != 0) + return (error); scred = smbfs_malloc_scred(); smb_makescred(scred, td, cred); diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 8077689caeac..079936946270 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -658,8 +658,10 @@ tmpfs_write(struct vop_write_args *v) if (uio->uio_offset + uio->uio_resid > VFS_TO_TMPFS(vp->v_mount)->tm_maxfilesize) return (EFBIG); - if (vn_rlimit_fsize(vp, uio, uio->uio_td)) - return (EFBIG); + error = vn_rlimit_fsize(vp, uio, uio->uio_td); + if (error != 0) + return (error); + if (uio->uio_offset + uio->uio_resid > node->tn_size) { error = tmpfs_reg_resize(vp, uio->uio_offset + uio->uio_resid, FALSE); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 04e8cb0037a2..1d2c4f332473 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3220,8 +3220,6 @@ vn_generic_copy_file_range(struct vnode *invp, off_t *inoffp, io.uio_offset = *outoffp; io.uio_resid = len; error = vn_rlimit_fsize(outvp, &io, fsize_td); - if (error != 0) - error = EFBIG; } if (VOP_PATHCONF(outvp, _PC_MIN_HOLE_SIZE, &holeout) != 0) holeout = 0; diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 8b4b523dbfc8..833177aa4a2b 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -894,8 +894,9 @@ ffs_write( * Maybe this should be above the vnode op call, but so long as * file servers have no limits, I don't think it matters. */ - if (vn_rlimit_fsize(vp, uio, uio->uio_td)) - return (EFBIG); + error = vn_rlimit_fsize(vp, uio, uio->uio_td); + if (error != 0) + return (error); resid = uio->uio_resid; osize = ip->i_size;