From nobody Sat Oct 08 00:39:06 2022 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 4MkmWv1YhXz4fGGr; Sat, 8 Oct 2022 00:39:07 +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 4MkmWv0hJBz3pLv; Sat, 8 Oct 2022 00:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665189547; 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=r2iUNvjIRIXa+uWlxzRbAW5GjR5i0GUO0qz+QsXT6ao=; b=xNDtEM37nY06AuacB0fcSh1GSr0whgMieVxICMnOr0QjvaUsGjoqgm3qhHe3gJO+7SEK9G p+EPACtd07ZVSqatwJyQxsNNlgoLddOwFdkk7ERGVmQA4yV7RXZEygyRnbKCC+QCwj+Pnq l5BqZGL+GXHzfh7IDj6qBKh9k62MfVcrEx/iaFvKtsy10i6wIztmMmx5sKEgjNCV7RBggw /BbmYrOlZlw760nsSyqLrXv3QeULQS2k0WlLNXyapXs+tZMhGqpm26L1bNsfnxC7bttZK2 UL18rnh8VCvJ5VQwAQJ2XSm4TbFy3pQ3XwegOU64bL/XlZ0+BKd0pf9AC/UDww== 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 4MkmWt6wFSzmQd; Sat, 8 Oct 2022 00:39: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 2980d623034306; Sat, 8 Oct 2022 00:39:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2980d6nJ034305; Sat, 8 Oct 2022 00:39:06 GMT (envelope-from git) Date: Sat, 8 Oct 2022 00:39:06 GMT Message-Id: <202210080039.2980d6nJ034305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3936744da50c - stable/13 - UFS: disallow truncation to set file size past RLIMIT_FSIZE 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3936744da50c0f10466780305208f61542131898 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665189547; 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=r2iUNvjIRIXa+uWlxzRbAW5GjR5i0GUO0qz+QsXT6ao=; b=lIUiVN5jgaRwpYeqZHWXRzW9Y/oOmoAaBM6mj9gHhmZ1s9bE54kZMEDMTi795IAN7KTuP3 lBYhm0dlDUFkjvYlAxf+wo6xa/2ZU1T9JgLDOsrUu8NzeIoTMEZ2SeGMF9zOTUtryDtgba NwE9J9ux2GycDCwMmNIGLyA/n8zSgB85QhTZnfJSH1Lw+Y6Zjpmlj9rnlm5m4cRoNQiWzt 4GpD3eF2/Vg2Kqj1DQBdh+J0QWLX9AMNwhVHy93RNU+R0H35DBmfxzc6yt0CauFM1+8Mwc GC/yEPMmPoBoJPRsmwKXGrXik8/r5tbhNbVyKLhirPFSC7pI9BJsbO91qSh9cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665189547; a=rsa-sha256; cv=none; b=Y4aK0nT3yF1t1tTOulT/aSeP0X9uTt2Gz+xwlmiL+dgoLe6ILHETLDDsNVoxxeUtEkywy6 30lKAGVRt/D/wvGjCoqGXgRNXZmQuceXDdYj3lMIG8PcwzPPn2OCz28yEdEyEBVcnKCxmg gopAWPGd8FmcdsOImXTC1z1Wn0AnBEdq0V5+VO/3SWicfcqWHgpIy639gNmkibIt44JNRe bzpj1l3KUWQNAOIsYs75qcqRW1B3wielF7OlA8HRTKeClswd1tQKvP1W39aU7TcPcou1Sa 3+WAP6Z6y0JLcS2PfMigINH9/3Bo1nN3CP8tIvvMD2tTBEA7QntWQC56Nrag5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3936744da50c0f10466780305208f61542131898 commit 3936744da50c0f10466780305208f61542131898 Author: Konstantin Belousov AuthorDate: 2022-09-18 11:49:57 +0000 Commit: Konstantin Belousov CommitDate: 2022-10-08 00:29:35 +0000 UFS: disallow truncation to set file size past RLIMIT_FSIZE PR: 164793 (cherry picked from commit 70385088cafaab3365c5243f22b8fc9c712c1fde) --- sys/ufs/ufs/ufs_vnops.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index c4af984745bf..71cee6ad7181 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -754,6 +754,9 @@ ufs_setattr( */ return (0); } + error = vn_rlimit_trunc(vap->va_size, td); + if (error != 0) + return (error); if ((error = UFS_TRUNCATE(vp, vap->va_size, IO_NORMAL | ((vap->va_vaflags & VA_SYNC) != 0 ? IO_SYNC : 0), cred)) != 0)