From: Filipe Manana <fdmanana@kernel.org>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH v2] btrfs: fix fallocate to use file_modified to update permissions consistently
Date: Tue, 15 Mar 2022 10:50:05 +0000 [thread overview]
Message-ID: <YjBvXWVmy8ooT9FP@debian9.Home> (raw)
In-Reply-To: <20220314175532.GB8165@magnolia>
On Mon, Mar 14, 2022 at 10:55:32AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Since the initial introduction of (posix) fallocate back at the turn of
> the century, it has been possible to use this syscall to change the
> user-visible contents of files. This can happen by extending the file
> size during a preallocation, or through any of the newer modes (punch,
> zero range). Because the call can be used to change file contents, we
> should treat it like we do any other modification to a file -- update
> the mtime, and drop set[ug]id privileges/capabilities.
>
> The VFS function file_modified() does all this for us if pass it a
> locked inode, so let's make fallocate drop permissions correctly.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> v2: move up file_modified to catch a case where we could modify file
> contents but fail on something else before we end up calling
> file_modified
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Thanks, it looks good Darrick.
It also survived a few full fstests runs.
> ---
> fs/btrfs/file.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index a0179cc62913..28ddd9cf2069 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -2918,8 +2918,9 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,
> return ret;
> }
>
> -static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
> +static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)
> {
> + struct inode *inode = file_inode(file);
> struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
> struct btrfs_root *root = BTRFS_I(inode)->root;
> struct extent_state *cached_state = NULL;
> @@ -2951,6 +2952,10 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
> goto out_only_mutex;
> }
>
> + ret = file_modified(file);
> + if (ret)
> + goto out_only_mutex;
> +
> lockstart = round_up(offset, btrfs_inode_sectorsize(BTRFS_I(inode)));
> lockend = round_down(offset + len,
> btrfs_inode_sectorsize(BTRFS_I(inode))) - 1;
> @@ -3391,7 +3396,7 @@ static long btrfs_fallocate(struct file *file, int mode,
> return -EOPNOTSUPP;
>
> if (mode & FALLOC_FL_PUNCH_HOLE)
> - return btrfs_punch_hole(inode, offset, len);
> + return btrfs_punch_hole(file, offset, len);
>
> /*
> * Only trigger disk allocation, don't trigger qgroup reserve
> @@ -3413,6 +3418,10 @@ static long btrfs_fallocate(struct file *file, int mode,
> goto out;
> }
>
> + ret = file_modified(file);
> + if (ret)
> + goto out;
> +
> /*
> * TODO: Move these two operations after we have checked
> * accurate reserved space, or fallocate can still fail but
next prev parent reply other threads:[~2022-03-15 10:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-14 17:55 [PATCH v2] btrfs: fix fallocate to use file_modified to update permissions consistently Darrick J. Wong
2022-03-15 10:50 ` Filipe Manana [this message]
2022-03-15 19:58 ` David Sterba
2022-03-20 15:24 ` [btrfs] 7664aed024: fio.write_iops 29.3% improvement kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YjBvXWVmy8ooT9FP@debian9.Home \
--to=fdmanana@kernel.org \
--cc=djwong@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox