From nobody Sun Sep 25 21:04:06 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 4MbJKL2VtWz4cx3S; Sun, 25 Sep 2022 21:04:06 +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 4MbJKL20cWz3flj; Sun, 25 Sep 2022 21:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664139846; 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=h0ToIJ7Do6dyI3c9uJ5xJTLVQEg/r3KqGTFe8L+qx2M=; b=KnrkGf9YP1PjFz32J0QXxgVSYSdm/Rtz940UuYiOFj9rgFjmhuTIbCs2fi42ccY56em9Uo bPpZRC9RaZO1eMK2wH2OeFzTY7rNRb3YLrS8EU1SHEo3fOzw5XxfP3V5WncdYxcgSjkScv LzAU0gFHw7iUy9t8x1iei/S+ppmPLl6L7/0FOpCdSHHaNTcdHk0tWy/Zkbr1jcJWTtu4P4 p2HGtlkOr8ludpWCYjsH0vIUfPMLT6lsDBnoFLt6xfqhhLXO/LI71Tlm9w7C7D4ar8+SBe by/XgiM3ZJY1RJnvZoZ7cjjUA1klpCV3KHqGQGBT1YHlLxSrW4czLvN+xTxl6g== 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 4MbJKL13ySzYCJ; Sun, 25 Sep 2022 21:04:06 +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 28PL46Fp067035; Sun, 25 Sep 2022 21:04:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PL46OV067034; Sun, 25 Sep 2022 21:04:06 GMT (envelope-from git) Date: Sun, 25 Sep 2022 21:04:06 GMT Message-Id: <202209252104.28PL46OV067034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 0a192b3abab1 - main - fusefs: respect RLIMIT_FSIZE during truncate 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a192b3abab19deac70f762cd1ec45ba09ec47ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664139846; 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=h0ToIJ7Do6dyI3c9uJ5xJTLVQEg/r3KqGTFe8L+qx2M=; b=OU9W5SMvDtS5a7mQkNbikbNQoglz1F8U54hbOYlUp/6PkOey1pzgd3I5mjlXmQR00vYdjn dg3H88pwzFxmc0RtdAwVioF9VpyLQLTrasy3igkL00iCJNBYf5BoW4UFzDIOC2KzoN1P+X SkA8WV09HaAUEELJ9Q7wjR0gzEqrGaXu/eC2jv0bq1tWanVeZEyH+ejonnlCwTlwnTmhV8 +cQbxWyu6W7HujOz31rRL1sJiCj3/p4xMefWOnWtcASH+w5AH+3xYsCf6QFhNMNHDPvUmp tlXm71ugiQOgHEq2p6T1MCuAErkpZSujc8+SgzlJMUcOMRFBWQtzWu6vuA8MGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664139846; a=rsa-sha256; cv=none; b=cii0vTNzSPcGYTgdPrD+Lf3r8wmrsKfuGerwqc+IcvwFcxKiK2UXUXk7HKviuEuifmeq6p fK5kFHbgWfF6PzuFak0jXDDjp3AOwRnjky/1pZngyiP1ui0KMp7OIzqy2+7DJu60opK0vO hEjc2FjzxTd+QfVGi30jijfECHIDY2/NqdnEMKDmElmu0qYjANZQF+ZEq8TKa3LRFomMKB UohXnDVxVMYVes9z9PYwQ6rxoPnvSWf+kXqoDjS1MKP39Vw4Z3FbwVKfR7NKKfVAktSGV8 9DzsNV8gw7Gq3iFldHlv+3SilcUFghxo2ARWxFRQFmmU3gbXLEFaoK/4Iw+UDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=0a192b3abab19deac70f762cd1ec45ba09ec47ca commit 0a192b3abab19deac70f762cd1ec45ba09ec47ca Author: Alan Somers AuthorDate: 2022-09-25 17:56:11 +0000 Commit: Alan Somers CommitDate: 2022-09-25 21:02:23 +0000 fusefs: respect RLIMIT_FSIZE during truncate PR: 164793 MFC after: 2 weeks Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D36703 --- sys/fs/fuse/fuse_vnops.c | 3 +++ tests/sys/fs/fusefs/setattr.cc | 44 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index e89b831a4859..6fa9a2b248c6 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2248,6 +2248,9 @@ fuse_vnop_setattr(struct vop_setattr_args *ap) case VREG: if (vfs_isrdonly(mp)) return (EROFS); + err = vn_rlimit_trunc(vap->va_size, td); + if (err) + return (err); break; default: /* diff --git a/tests/sys/fs/fusefs/setattr.cc b/tests/sys/fs/fusefs/setattr.cc index 00b37ec7965a..e245c274ba07 100644 --- a/tests/sys/fs/fusefs/setattr.cc +++ b/tests/sys/fs/fusefs/setattr.cc @@ -31,10 +31,14 @@ */ extern "C" { +#include +#include #include +#include #include #include +#include } #include "mockfs.hh" @@ -42,11 +46,15 @@ extern "C" { using namespace testing; -class Setattr : public FuseTest {}; +class Setattr : public FuseTest { +public: +static sig_atomic_t s_sigxfsz; +}; class RofsSetattr: public Setattr { public: virtual void SetUp() { + s_sigxfsz = 0; m_ro = true; Setattr::SetUp(); } @@ -61,6 +69,12 @@ virtual void SetUp() { }; +sig_atomic_t Setattr::s_sigxfsz = 0; + +void sigxfsz_handler(int __unused sig) { + Setattr::s_sigxfsz = 1; +} + /* * If setattr returns a non-zero cache timeout, then subsequent VOP_GETATTRs * should use the cached attributes, rather than query the daemon @@ -553,6 +567,34 @@ TEST_F(Setattr, truncate_discards_cached_data) { leak(fd); } +/* truncate should fail if it would cause the file to exceed RLIMIT_FSIZE */ +TEST_F(Setattr, truncate_rlimit_rsize) +{ + const char FULLPATH[] = "mountpoint/some_file.txt"; + const char RELPATH[] = "some_file.txt"; + struct rlimit rl; + const uint64_t ino = 42; + const uint64_t oldsize = 0; + const uint64_t newsize = 100'000'000; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = S_IFREG | 0644; + out.body.entry.nodeid = ino; + out.body.entry.attr.size = oldsize; + }))); + + rl.rlim_cur = newsize / 2; + rl.rlim_max = 10 * newsize; + ASSERT_EQ(0, setrlimit(RLIMIT_FSIZE, &rl)) << strerror(errno); + ASSERT_NE(SIG_ERR, signal(SIGXFSZ, sigxfsz_handler)) << strerror(errno); + + EXPECT_EQ(-1, truncate(FULLPATH, newsize)); + EXPECT_EQ(EFBIG, errno); + EXPECT_EQ(1, s_sigxfsz); +} + /* Change a file's timestamps */ TEST_F(Setattr, utimensat) { const char FULLPATH[] = "mountpoint/some_file.txt";