From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/5] xfs: fallocate() should call file_modified()
Date: Mon, 31 Jan 2022 09:27:05 -0800 [thread overview]
Message-ID: <20220131172705.GB8313@magnolia> (raw)
In-Reply-To: <20220131064350.739863-3-david@fromorbit.com>
On Mon, Jan 31, 2022 at 05:43:47PM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> In XFS, we always update the inode change and modification time when
> any fallocate() operation succeeds. Furthermore, as various
> fallocate modes can change the file contents (extending EOF,
> punching holes, zeroing things, shifting extents), we should drop
> file privileges like suid just like we do for a regular write().
> There's already a VFS helper that figures all this out for us, so
> use that.
>
> The net effect of this is that we no longer drop suid/sgid if the
> caller is root, but we also now drop file capabilities.
>
> We also move the xfs_update_prealloc_flags() function so that it now
> is only called by the scope that needs to set the the prealloc flag.
>
> Based on a patch from Darrick Wong.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
I think you can get rid of @flags entirely, right?
With that fixed, I think this looks good.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_file.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 6eda41710a5a..223996822d84 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -953,6 +953,10 @@ xfs_file_fallocate(
> goto out_unlock;
> }
>
> + error = file_modified(file);
> + if (error)
> + goto out_unlock;
> +
> if (mode & FALLOC_FL_PUNCH_HOLE) {
> error = xfs_free_file_space(ip, offset, len);
> if (error)
> @@ -1053,11 +1057,12 @@ xfs_file_fallocate(
> if (error)
> goto out_unlock;
> }
> - }
>
> - error = xfs_update_prealloc_flags(ip, flags);
> - if (error)
> - goto out_unlock;
> + error = xfs_update_prealloc_flags(ip, XFS_PREALLOC_SET);
> + if (error)
> + goto out_unlock;
> +
> + }
>
> /* Change file size if needed */
> if (new_size) {
> --
> 2.33.0
>
next prev parent reply other threads:[~2022-01-31 17:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-30 4:59 [PATCHSET v2 0/3] xfs: fix permission drop and flushing in fallocate Darrick J. Wong
2022-01-30 4:59 ` [PATCH 1/3] xfs: use vfs helper to update file attributes after fallocate Darrick J. Wong
2022-01-30 22:30 ` Dave Chinner
2022-01-30 4:59 ` [PATCH 2/3] xfs: flush log after fallocate for sync mounts and sync inodes Darrick J. Wong
2022-01-30 4:59 ` [PATCH 3/3] xfs: ensure log flush at the end of a synchronous fallocate call Darrick J. Wong
2022-01-30 21:59 ` Dave Chinner
2022-01-31 6:43 ` [PATCH 0/5] xfs: fallocate() vs xfs_update_prealloc_flags() Dave Chinner
2022-01-31 6:43 ` [PATCH 1/5] xfs: remove XFS_PREALLOC_SYNC Dave Chinner
2022-01-31 17:25 ` Darrick J. Wong
2022-01-31 6:43 ` [PATCH 2/5] xfs: fallocate() should call file_modified() Dave Chinner
2022-01-31 17:27 ` Darrick J. Wong [this message]
2022-01-31 6:43 ` [PATCH 3/5] xfs: set prealloc flag in xfs_alloc_file_space() Dave Chinner
2022-01-31 7:02 ` [PATCH v1.1 " Dave Chinner
2022-01-31 17:30 ` Darrick J. Wong
2022-01-31 6:43 ` [PATCH 4/5] xfs: move xfs_update_prealloc_flags() to xfs_pnfs.c Dave Chinner
2022-01-31 17:37 ` Darrick J. Wong
2022-01-31 6:43 ` [PATCH 5/5] xfs: ensure log flush at the end of a synchronous fallocate call Dave Chinner
2022-02-01 16:37 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2022-01-31 23:39 [PATCH 0/5 v2] xfs: fallocate() vs xfs_update_prealloc_flags() Dave Chinner
2022-01-31 23:39 ` [PATCH 2/5] xfs: fallocate() should call file_modified() Dave Chinner
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=20220131172705.GB8313@magnolia \
--to=djwong@kernel.org \
--cc=david@fromorbit.com \
--cc=linux-xfs@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