All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org,
	linux-cifs@vger.kernel.org, Amir Goldstein <amir73il@gmail.com>,
	linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org,
	linux-mm@kvack.org, linux-btrfs@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com
Subject: [PATCH 12/29] vfs: remap helper should update destination inode metadata
Date: Wed, 17 Oct 2018 15:45:38 -0700	[thread overview]
Message-ID: <153981633799.5568.10992236383232225210.stgit@magnolia> (raw)
In-Reply-To: <153981625504.5568.2708520119290577378.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

Extend generic_remap_file_range_prep to handle inode metadata updates
when remapping into a file.  If the operation can possibly alter the
file contents, we must update the ctime and mtime and remove security
privileges, just like we do for regular file writes.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
---
 fs/read_write.c      |   19 +++++++++++++++++++
 fs/xfs/xfs_reflink.c |   23 -----------------------
 2 files changed, 19 insertions(+), 23 deletions(-)


diff --git a/fs/read_write.c b/fs/read_write.c
index ebcbfc4f2907..b61bd3fc7154 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1820,6 +1820,25 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 	if (ret)
 		return ret;
 
+	/* If can't alter the file contents, we're done. */
+	if (!(remap_flags & REMAP_FILE_DEDUP)) {
+		/* Update the timestamps, since we can alter file contents. */
+		if (!(file_out->f_mode & FMODE_NOCMTIME)) {
+			ret = file_update_time(file_out);
+			if (ret)
+				return ret;
+		}
+
+		/*
+		 * Clear the security bits if the process is not being run by
+		 * root.  This keeps people from modifying setuid and setgid
+		 * binaries.
+		 */
+		ret = file_remove_privs(file_out);
+		if (ret)
+			return ret;
+	}
+
 	return 1;
 }
 EXPORT_SYMBOL(generic_remap_file_range_prep);
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 29aab196ce7e..2d7dd8b28d7c 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -1372,29 +1372,6 @@ xfs_reflink_remap_prep(
 	truncate_inode_pages_range(&inode_out->i_data, pos_out,
 				   PAGE_ALIGN(pos_out + *len) - 1);
 
-	/* If we're altering the file contents... */
-	if (!(remap_flags & REMAP_FILE_DEDUP)) {
-		/*
-		 * ...update the timestamps (which will grab the ilock again
-		 * from xfs_fs_dirty_inode, so we have to call it before we
-		 * take the ilock).
-		 */
-		if (!(file_out->f_mode & FMODE_NOCMTIME)) {
-			ret = file_update_time(file_out);
-			if (ret)
-				goto out_unlock;
-		}
-
-		/*
-		 * ...clear the security bits if the process is not being run
-		 * by root.  This keeps people from modifying setuid and setgid
-		 * binaries.
-		 */
-		ret = file_remove_privs(file_out);
-		if (ret)
-			goto out_unlock;
-	}
-
 	return 1;
 out_unlock:
 	xfs_reflink_remap_unlock(file_in, file_out);

WARNING: multiple messages have this Message-ID (diff)
From: Darrick J. Wong <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org,
	linux-cifs@vger.kernel.org, Amir Goldstein <amir73il@gmail.com>,
	linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org,
	linux-mm@kvack.org, linux-btrfs@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH 12/29] vfs: remap helper should update destination inode metadata
Date: Wed, 17 Oct 2018 15:45:38 -0700	[thread overview]
Message-ID: <153981633799.5568.10992236383232225210.stgit@magnolia> (raw)
In-Reply-To: <153981625504.5568.2708520119290577378.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

Extend generic_remap_file_range_prep to handle inode metadata updates
when remapping into a file.  If the operation can possibly alter the
file contents, we must update the ctime and mtime and remove security
privileges, just like we do for regular file writes.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
---
 fs/read_write.c      |   19 +++++++++++++++++++
 fs/xfs/xfs_reflink.c |   23 -----------------------
 2 files changed, 19 insertions(+), 23 deletions(-)


diff --git a/fs/read_write.c b/fs/read_write.c
index ebcbfc4f2907..b61bd3fc7154 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1820,6 +1820,25 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 	if (ret)
 		return ret;
 
+	/* If can't alter the file contents, we're done. */
+	if (!(remap_flags & REMAP_FILE_DEDUP)) {
+		/* Update the timestamps, since we can alter file contents. */
+		if (!(file_out->f_mode & FMODE_NOCMTIME)) {
+			ret = file_update_time(file_out);
+			if (ret)
+				return ret;
+		}
+
+		/*
+		 * Clear the security bits if the process is not being run by
+		 * root.  This keeps people from modifying setuid and setgid
+		 * binaries.
+		 */
+		ret = file_remove_privs(file_out);
+		if (ret)
+			return ret;
+	}
+
 	return 1;
 }
 EXPORT_SYMBOL(generic_remap_file_range_prep);
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 29aab196ce7e..2d7dd8b28d7c 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -1372,29 +1372,6 @@ xfs_reflink_remap_prep(
 	truncate_inode_pages_range(&inode_out->i_data, pos_out,
 				   PAGE_ALIGN(pos_out + *len) - 1);
 
-	/* If we're altering the file contents... */
-	if (!(remap_flags & REMAP_FILE_DEDUP)) {
-		/*
-		 * ...update the timestamps (which will grab the ilock again
-		 * from xfs_fs_dirty_inode, so we have to call it before we
-		 * take the ilock).
-		 */
-		if (!(file_out->f_mode & FMODE_NOCMTIME)) {
-			ret = file_update_time(file_out);
-			if (ret)
-				goto out_unlock;
-		}
-
-		/*
-		 * ...clear the security bits if the process is not being run
-		 * by root.  This keeps people from modifying setuid and setgid
-		 * binaries.
-		 */
-		ret = file_remove_privs(file_out);
-		if (ret)
-			goto out_unlock;
-	}
-
 	return 1;
 out_unlock:
 	xfs_reflink_remap_unlock(file_in, file_out);

  parent reply	other threads:[~2018-10-17 22:45 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-17 22:44 [PATCH v6 00/29] fs: fixes for serious clone/dedupe problems Darrick J. Wong
2018-10-17 22:44 ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:44 ` [PATCH 01/29] vfs: vfs_clone_file_prep_inodes should return EINVAL for a clone from beyond EOF Darrick J. Wong
2018-10-17 22:44   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:44 ` [PATCH 02/29] vfs: check file ranges before cloning files Darrick J. Wong
2018-10-17 22:44   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:44 ` [PATCH 03/29] vfs: exit early from zero length remap operations Darrick J. Wong
2018-10-17 22:44   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:44 ` [PATCH 04/29] vfs: strengthen checking of file range inputs to generic_remap_checks Darrick J. Wong
2018-10-17 22:44   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-18  0:41   ` Al Viro
2018-10-18  0:41     ` [Ocfs2-devel] " Al Viro
2018-10-18  4:37     ` Darrick J. Wong
2018-10-18  4:37       ` [Ocfs2-devel] " Darrick J. Wong
2018-10-18 18:56   ` [PATCH v2 " Darrick J. Wong
2018-10-18 18:56     ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:44 ` [PATCH 05/29] vfs: avoid problematic remapping requests into partial EOF block Darrick J. Wong
2018-10-17 22:44   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:44 ` [PATCH 06/29] vfs: skip zero-length dedupe requests Darrick J. Wong
2018-10-17 22:44   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 07/29] vfs: rename vfs_clone_file_prep to be more descriptive Darrick J. Wong
2018-10-17 22:45   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 08/29] vfs: rename clone_verify_area to remap_verify_area Darrick J. Wong
2018-10-17 22:45   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 09/29] vfs: combine the clone and dedupe into a single remap_file_range Darrick J. Wong
2018-10-17 22:45   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-18  0:48   ` Al Viro
2018-10-18  0:48     ` [Ocfs2-devel] " Al Viro
2018-10-18  4:47     ` Darrick J. Wong
2018-10-18  4:47       ` [Ocfs2-devel] " Darrick J. Wong
2018-10-18  4:47       ` Darrick J. Wong
2018-10-18  4:54       ` Al Viro
2018-10-18  4:54         ` [Ocfs2-devel] " Al Viro
2018-10-18  5:03         ` Darrick J. Wong
2018-10-18  5:03           ` [Ocfs2-devel] " Darrick J. Wong
2018-10-18 18:57   ` [PATCH v2 " Darrick J. Wong
2018-10-18 18:57     ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 10/29] vfs: pass remap flags to generic_remap_file_range_prep Darrick J. Wong
2018-10-17 22:45   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 11/29] vfs: pass remap flags to generic_remap_checks Darrick J. Wong
2018-10-17 22:45   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:45 ` Darrick J. Wong [this message]
2018-10-17 22:45   ` [Ocfs2-devel] [PATCH 12/29] vfs: remap helper should update destination inode metadata Darrick J. Wong
2018-10-17 22:45 ` [PATCH 13/29] vfs: make remap_file_range functions take and return bytes completed Darrick J. Wong
2018-10-17 22:45   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-18 18:57   ` [PATCH v2 " Darrick J. Wong
2018-10-18 18:57     ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 14/29] vfs: plumb remap flags through the vfs clone functions Darrick J. Wong
2018-10-17 22:45   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 15/29] vfs: plumb remap flags through the vfs dedupe functions Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 16/29] vfs: enable remap callers that can handle short operations Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-18 18:58   ` [PATCH v2 " Darrick J. Wong
2018-10-18 18:58     ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 17/29] vfs: hide file range comparison function Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46   ` Darrick J. Wong
2018-10-17 22:46 ` [PATCH 18/29] vfs: clean up generic_remap_file_range_prep return value Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46   ` Darrick J. Wong
2018-10-17 22:46 ` [PATCH 19/29] ocfs2: truncate page cache for clone destination file before remapping Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 20/29] ocfs2: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 21/29] ocfs2: support partial clone range and dedupe range Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 22/29] ocfs2: remove ocfs2_reflink_remap_range Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 23/29] xfs: add a per-xfs trace_printk macro Darrick J. Wong
2018-10-17 22:46   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:47 ` [PATCH 24/29] xfs: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-17 22:47   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:47   ` Darrick J. Wong
2018-10-17 22:47 ` [PATCH 25/29] xfs: clean up xfs_reflink_remap_blocks call site Darrick J. Wong
2018-10-17 22:47   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:47 ` [PATCH 26/29] xfs: support returning partial reflink results Darrick J. Wong
2018-10-17 22:47   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:47 ` [PATCH 27/29] xfs: remove redundant remap partial EOF block checks Darrick J. Wong
2018-10-17 22:47   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:47 ` [PATCH 28/29] xfs: remove xfs_reflink_remap_range Darrick J. Wong
2018-10-17 22:47   ` [Ocfs2-devel] " Darrick J. Wong
2018-10-17 22:47 ` [PATCH 29/29] xfs: remove [cm]time update from reflink calls Darrick J. Wong
2018-10-17 22:47   ` [Ocfs2-devel] " Darrick J. Wong

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=153981633799.5568.10992236383232225210.stgit@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=amir73il@gmail.com \
    --cc=david@fromorbit.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=ocfs2-devel@oss.oracle.com \
    --cc=sandeen@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.