From nobody Sat Sep 24 16:42:38 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 4MZZZ662tyz4d3Dl; Sat, 24 Sep 2022 16:42:38 +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 4MZZZ65YmZz3GHm; Sat, 24 Sep 2022 16:42:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664037758; 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=AOJItPWRjeWjaZewH4jeA7abEBBkPohpJVPG6jWuWbY=; b=UFG0FUAfKZZ9uOAyn0cDmomRfFzwweVYu36b5cDJ21CHVt1FIvc+IvhiX02Ge/S5IcJS7m bhmTs1V1KE7+lxSOYtPLknMdGi037Fh65yW0HNIdRMXOXJBbfnnWwhn6ZxmCEgDOWveCnT gqgNCbEtMQkKGR74WRQth7UVZurkxC3dKcXggoGopZ1sPjKJ4Gg0s8gJrVzE1X4nt3v23g 2NQmDocJC7Z6/lUGyUWlJtbpfbJpSuNDt1o7b9vgCiGV4uJ9cDuvm3FyGixrXnZLOKAqSI isu43jhWCBDjEQvehjv/IZoox3tbBosjOBGVHxeZErBuOL7HXbDfcsH8jweAog== 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 4MZZZ64JgTz17mB; Sat, 24 Sep 2022 16:42:38 +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 28OGgc3a058167; Sat, 24 Sep 2022 16:42:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28OGgcmM058166; Sat, 24 Sep 2022 16:42:38 GMT (envelope-from git) Date: Sat, 24 Sep 2022 16:42:38 GMT Message-Id: <202209241642.28OGgcmM058166@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: 87525ef94007 - main - FFS: truncate write if it would exceed the fs max file size or RLIMIT_FSIZE 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: 87525ef94007c792c6745db7938251a663ca5706 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664037758; 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=AOJItPWRjeWjaZewH4jeA7abEBBkPohpJVPG6jWuWbY=; b=fVYXHPgr0LgXHvC6oZ9ZSgqARkKdxs17WZ5CgPqXCjv4Yl7kAMc5fFl0dbctdBuiSxqvpr a9QlCAb2rPh6lqtpEoPPRirirLtpuOIyYlvi528RhS1e/ncywVyxScp7W1cPKejW79yrEw RJIP2ggj2Zfyg/WbRYRFBaafQiZL5BGUED9fPFmtUco+aQrj0p5mca6kzKYHdaDeIiKH5F 8kUrncJa96KRGYvENTvD3xncspvO+wvO1OiDCIUuNsnyetxI8xstX7G2d3FpsZAp0FjEI+ Uk36b/l86ijNTTknfeVmw4Z62UQrjW8x3uPTMfHTv1k06bqx1JIcDmvzhFxcsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664037758; a=rsa-sha256; cv=none; b=oqJAN/rTSYeVgKLiW75Avj9P6UzK6g6kB7hEXwbWFzIDhb53CCDOkaikYZYXUSazHnMNHU YqlW+jhUwVa7+6eXWZxGplHIJCG2AZ/XIh5SJ6YbzP8YIKHz8LRsJ6tA1cXx9XVLHGOKvL iB9/LP28DpnMroGp71aLGVdSH19C2t5KUSRyBuWVGtfaQXql7Ytj9ASiLs0+6t+JzmV96L TlnWIrqTRYFDrX6mCLYfozSPmA57/WbuPNA6V2d5LzIN4/cEWjF2DF7K0pG0WawhWtalUI SJm0fEK2elVtYmChZO1phXB4qR0fgCGKD4/DvgEmfv6ALHTbGyLGrmQf3u28tw== 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=87525ef94007c792c6745db7938251a663ca5706 commit 87525ef94007c792c6745db7938251a663ca5706 Author: Konstantin Belousov AuthorDate: 2022-09-18 11:48:40 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-24 16:41:57 +0000 FFS: truncate write if it would exceed the fs max file size or RLIMIT_FSIZE PR: 164793 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/ufs/ffs/ffs_vnops.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 833177aa4a2b..f28a6e54143d 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -839,7 +839,7 @@ ffs_write( struct buf *bp; ufs_lbn_t lbn; off_t osize; - ssize_t resid; + ssize_t resid, r; int seqcount; int blkoffset, error, flags, ioflag, size, xfersize; @@ -888,15 +888,17 @@ ffs_write( KASSERT(uio->uio_resid >= 0, ("ffs_write: uio->uio_resid < 0")); KASSERT(uio->uio_offset >= 0, ("ffs_write: uio->uio_offset < 0")); fs = ITOFS(ip); - if ((uoff_t)uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize) - return (EFBIG); + /* * Maybe this should be above the vnode op call, but so long as * file servers have no limits, I don't think it matters. */ - error = vn_rlimit_fsize(vp, uio, uio->uio_td); - if (error != 0) + error = vn_rlimit_fsizex(vp, uio, fs->fs_maxfilesize, &r, + uio->uio_td); + if (error != 0) { + vn_rlimit_fsizex_res(uio, r); return (error); + } resid = uio->uio_resid; osize = ip->i_size; @@ -1037,6 +1039,7 @@ ffs_write( if (ffs_fsfail_cleanup(VFSTOUFS(vp->v_mount), error)) error = ENXIO; } + vn_rlimit_fsizex_res(uio, r); return (error); }