This is a note to let you know that I've just added the patch titled xfs: fallocate() should call file_modified() to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: xfs-fallocate-should-call-file_modified.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From stable-owner@xxxxxxxxxxxxxxx Sat Mar 18 11:15:51 2023 From: Amir Goldstein <amir73il@xxxxxxxxx> Date: Sat, 18 Mar 2023 12:15:19 +0200 Subject: xfs: fallocate() should call file_modified() To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx>, "Darrick J . Wong" <djwong@xxxxxxxxxx>, Leah Rumancik <leah.rumancik@xxxxxxxxx>, Chandan Babu R <chandan.babu@xxxxxxxxxx>, Christian Brauner <brauner@xxxxxxxxxx>, linux-fsdevel@xxxxxxxxxxxxxxx, linux-xfs@xxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx, Dave Chinner <dchinner@xxxxxxxxxx> Message-ID: <20230318101529.1361673-6-amir73il@xxxxxxxxx> From: Dave Chinner <dchinner@xxxxxxxxxx> commit fbe7e520036583a783b13ff9744e35c2a329d9a4 upstream. 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@xxxxxxxxxx> Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/xfs/xfs_file.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -895,6 +895,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) @@ -996,11 +1000,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) { Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are queue-5.10/xfs-fallocate-should-call-file_modified.patch queue-5.10/attr-add-setattr_should_drop_sgid.patch queue-5.10/xfs-set-prealloc-flag-in-xfs_alloc_file_space.patch queue-5.10/xfs-purge-dquots-after-inode-walk-fails-during-quotacheck.patch queue-5.10/fs-use-consistent-setgid-checks-in-is_sxid.patch queue-5.10/xfs-remove-xfs_prealloc_sync.patch queue-5.10/attr-add-in_group_or_capable.patch queue-5.10/xfs-don-t-assert-fail-on-perag-references-on-teardown.patch queue-5.10/xfs-don-t-leak-btree-cursor-when-insrec-fails-after-a-split.patch queue-5.10/fs-move-s_isgid-stripping-into-the-vfs_-helpers.patch queue-5.10/xfs-remove-xfs_setattr_time-declaration.patch queue-5.10/fs-move-should_remove_suid.patch queue-5.10/attr-use-consistent-sgid-stripping-checks.patch queue-5.10/fs-add-mode_strip_sgid-helper.patch queue-5.10/xfs-use-setattr_copy-to-set-vfs-inode-attributes.patch