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 <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 <linux-fsdevel@vger.kernel.org>,
linux-api@vger.kernel.org, ceph-devel@vger.kernel.org,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
CIFS <linux-cifs@vger.kernel.org>
Subject: Re: [PATCH v3 07/13] xfs: use file_modified() helper
Date: Wed, 29 May 2019 22:10:37 +0300 [thread overview]
Message-ID: <CAOQ4uxg0Z8Ne8kadPzsushW43t3Sijy+9WQbGRRO=CtmMAbtuA@mail.gmail.com> (raw)
In-Reply-To: <20190529183149.GG5231@magnolia>
On Wed, May 29, 2019 at 9:31 PM Darrick J. Wong <darrick.wong@oracle.com> wrote:
>
> On Wed, May 29, 2019 at 08:43:11PM +0300, Amir Goldstein wrote:
> > 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>
> > ---
> > 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))) {
>
> ...especially since here we think NOCMTIME is likely /not/ to be set.
>
> > - 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);
>
> Hm, file_modified doesn't have the !IS_NOSEC check guarding
> file_remove_privs, are you sure it's ok to remove the suid bits
> unconditionally? Even if SB_NOSEC (and therefore S_NOSEC) are set?
>
file_remove_privs() has its own IS_NOSEC() check.
Thanks,
Amir.
next prev parent reply other threads:[~2019-05-29 19:10 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 [this message]
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 ` [PATCH v3 09/13] ceph: " Amir Goldstein
2019-05-29 19:43 ` 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='CAOQ4uxg0Z8Ne8kadPzsushW43t3Sijy+9WQbGRRO=CtmMAbtuA@mail.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).