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 v4 7/9] xfs: use file_modified() helper
Date: Fri, 31 May 2019 19:46:59 +0300 [thread overview]
Message-ID: <20190531164701.15112-8-amir73il@gmail.com> (raw)
In-Reply-To: <20190531164701.15112-1-amir73il@gmail.com>
Note that by using the helper, the order of calling file_remove_privs()
after file_update_mtime() in xfs_file_aio_write_checks() has changed.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/xfs_file.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 76748255f843..916a35cae5e9 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -367,20 +367,7 @@ xfs_file_aio_write_checks(
* lock above. Eventually we should look into a way to avoid
* the pointless lock roundtrip.
*/
- if (likely(!(file->f_mode & FMODE_NOCMTIME))) {
- error = file_update_time(file);
- if (error)
- return error;
- }
-
- /*
- * If we're writing the file then make sure to clear the setuid and
- * setgid bits if the process is not being run by root. This keeps
- * people from modifying setuid and setgid binaries.
- */
- if (!IS_NOSEC(inode))
- return file_remove_privs(file);
- return 0;
+ return file_modified(file);
}
static int
--
2.17.1
next prev parent reply other threads:[~2019-05-31 16:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-31 16:46 [PATCH v4 0/9] Fixes for major copy_file_range() issues Amir Goldstein
2019-05-31 16:46 ` [PATCH v4 1/9] vfs: introduce generic_copy_file_range() Amir Goldstein
2019-05-31 16:46 ` [PATCH v4 2/9] vfs: no fallback for ->copy_file_range Amir Goldstein
2019-05-31 16:46 ` [PATCH v4 3/9] vfs: introduce generic_file_rw_checks() Amir Goldstein
2019-05-31 16:46 ` [PATCH v4 4/9] vfs: remove redundant checks from generic_remap_checks() Amir Goldstein
2019-05-31 16:46 ` [PATCH v4 5/9] vfs: add missing checks to copy_file_range Amir Goldstein
2019-05-31 16:46 ` [PATCH v4 6/9] vfs: introduce file_modified() helper Amir Goldstein
2019-05-31 16:46 ` Amir Goldstein [this message]
2019-05-31 16:47 ` [PATCH v4 8/9] vfs: allow copy_file_range to copy across devices Amir Goldstein
2019-05-31 16:47 ` [PATCH v4 9/9] fuse: copy_file_range needs to strip setuid bits and update timestamps 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=20190531164701.15112-8-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).