From: Amir Goldstein <amir73il@gmail.com>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>,
linux-xfs@vger.kernel.org,
Olga Kornievskaia <olga.kornievskaia@gmail.com>,
Luis Henriques <lhenriques@suse.com>,
Al Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org,
ceph-devel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-cifs@vger.kernel.org
Subject: [PATCH v3 09/13] ceph: copy_file_range needs to strip setuid bits and update timestamps
Date: Wed, 29 May 2019 20:43:13 +0300 [thread overview]
Message-ID: <20190529174318.22424-10-amir73il@gmail.com> (raw)
In-Reply-To: <20190529174318.22424-1-amir73il@gmail.com>
Because ceph doesn't hold destination inode lock throughout the copy,
strip setuid bits before and after copy.
The destination inode mtime is updated before and after the copy and the
source inode atime is updated after the copy, similar to the filesystem
->read_iter() implementation.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/ceph/file.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index e87f7b2023af..8a70708e1aca 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1947,6 +1947,15 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,
goto out;
}
+ /* Should dst_inode lock be held throughout the copy operation? */
+ inode_lock(dst_inode);
+ ret = file_modified(dst_file);
+ inode_unlock(dst_inode);
+ if (ret < 0) {
+ dout("failed to modify dst file before copy (%zd)\n", ret);
+ goto out;
+ }
+
/*
* We need FILE_WR caps for dst_ci and FILE_RD for src_ci as other
* clients may have dirty data in their caches. And OSDs know nothing
@@ -2097,6 +2106,14 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,
out:
ceph_free_cap_flush(prealloc_cf);
+ file_accessed(src_file);
+ /* To be on the safe side, remove privs also after copy */
+ inode_lock(dst_inode);
+ err = file_modified(dst_file);
+ inode_unlock(dst_inode);
+ if (err < 0)
+ dout("failed to modify dst file after copy (%zd)\n", err);
+
return ret;
}
--
2.17.1
next prev parent reply other threads:[~2019-05-29 17:43 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 17:43 [PATCH v3 00/13] Fixes for major copy_file_range() issues Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 01/13] vfs: introduce generic_copy_file_range() Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 02/13] vfs: no fallback for ->copy_file_range Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 03/13] vfs: introduce generic_file_rw_checks() Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 04/13] vfs: remove redundant checks from generic_remap_checks() Amir Goldstein
2019-05-29 18:23 ` Darrick J. Wong
2019-05-29 17:43 ` [PATCH v3 05/13] vfs: add missing checks to copy_file_range Amir Goldstein
2019-05-29 18:24 ` Darrick J. Wong
2019-05-29 17:43 ` [PATCH v3 06/13] vfs: introduce file_modified() helper Amir Goldstein
2019-05-29 18:27 ` Darrick J. Wong
2019-05-29 19:08 ` Amir Goldstein
2019-05-29 19:23 ` Amir Goldstein
2019-05-29 21:41 ` Dave Chinner
2019-05-29 17:43 ` [PATCH v3 07/13] xfs: use " Amir Goldstein
2019-05-29 18:31 ` Darrick J. Wong
2019-05-29 19:10 ` Amir Goldstein
2019-05-29 19:13 ` Darrick J. Wong
2019-05-29 17:43 ` [PATCH v3 08/13] vfs: copy_file_range needs to strip setuid bits and update timestamps Amir Goldstein
2019-05-29 18:33 ` Darrick J. Wong
2019-05-29 21:08 ` Amir Goldstein
2019-05-29 17:43 ` Amir Goldstein [this message]
2019-05-29 19:43 ` [PATCH v3 09/13] ceph: " Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 10/13] cifs: " Amir Goldstein
2019-05-29 19:36 ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 11/13] fuse: " Amir Goldstein
2019-05-29 19:37 ` Amir Goldstein
2019-05-29 20:07 ` Miklos Szeredi
2019-05-29 17:43 ` [PATCH v3 12/13] nfs: " Amir Goldstein
2019-05-29 19:34 ` Amir Goldstein
2019-05-29 20:02 ` Trond Myklebust
2019-05-29 21:00 ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 13/13] vfs: allow copy_file_range to copy across devices Amir Goldstein
2019-05-29 20:09 ` Olga Kornievskaia
2019-05-29 21:03 ` Amir Goldstein
2019-06-03 20:39 ` Olga Kornievskaia
2019-06-04 4:11 ` Amir Goldstein
2019-05-29 17:43 ` [PATCH v3 14/13] man-pages: copy_file_range updates Amir Goldstein
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=20190529174318.22424-10-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=ceph-devel@vger.kernel.org \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=lhenriques@suse.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=olga.kornievskaia@gmail.com \
--cc=viro@zeniv.linux.org.uk \
/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).