linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Leah Rumancik <leah.rumancik@gmail.com>
To: stable@vger.kernel.org
Cc: linux-xfs@vger.kernel.org, amir73il@gmail.com,
	chandan.babu@oracle.com, Dave Chinner <dchinner@redhat.com>,
	"Darrick J . Wong" <djwong@kernel.org>,
	Leah Rumancik <leah.rumancik@gmail.com>
Subject: [PATCH 5.15 03/11] xfs: fallocate() should call file_modified()
Date: Tue,  7 Mar 2023 10:59:14 -0800	[thread overview]
Message-ID: <20230307185922.125907-4-leah.rumancik@gmail.com> (raw)
In-Reply-To: <20230307185922.125907-1-leah.rumancik@gmail.com>

From: Dave Chinner <dchinner@redhat.com>

commit fbe7e520036583a783b13ff9744e35c2a329d9a4 upsream.

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>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Tested-by: Leah Rumancik <leah.rumancik@gmail.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
---
 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 752b676c92e3..020e0a412287 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -954,6 +954,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)
@@ -1055,11 +1059,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.40.0.rc0.216.gc4246ad0f0-goog


  parent reply	other threads:[~2023-03-07 19:16 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-07 18:59 [PATCH 5.15 00/11] sgid fixes for 5.15.y Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 01/11] xfs: use setattr_copy to set vfs inode attributes Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 02/11] xfs: remove XFS_PREALLOC_SYNC Leah Rumancik
2023-03-07 18:59 ` Leah Rumancik [this message]
2023-03-07 18:59 ` [PATCH 5.15 04/11] xfs: set prealloc flag in xfs_alloc_file_space() Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 05/11] fs: add mode_strip_sgid() helper Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 06/11] fs: move S_ISGID stripping into the vfs_*() helpers Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 07/11] attr: add in_group_or_capable() Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 08/11] fs: move should_remove_suid() Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 09/11] attr: add setattr_should_drop_sgid() Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 10/11] attr: use consistent sgid stripping checks Leah Rumancik
2023-03-07 18:59 ` [PATCH 5.15 11/11] fs: use consistent setgid checks in is_sxid() Leah Rumancik
2023-03-14  2:16 ` [PATCH 5.15 00/11] sgid fixes for 5.15.y Sasha Levin

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=20230307185922.125907-4-leah.rumancik@gmail.com \
    --to=leah.rumancik@gmail.com \
    --cc=amir73il@gmail.com \
    --cc=chandan.babu@oracle.com \
    --cc=dchinner@redhat.com \
    --cc=djwong@kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=stable@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;
as well as URLs for NNTP newsgroup(s).