From: David Laight <David.Laight@ACULAB.COM>
To: 'Rich Felker' <dalias@libc.org>,
"linux-api@vger.kernel.org" <linux-api@vger.kernel.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
"linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] vfs: add fchmodat2 syscall
Date: Thu, 10 Sep 2020 15:23:40 +0000 [thread overview]
Message-ID: <1111806ca0344527a8855616e46346c5@AcuMS.aculab.com> (raw)
In-Reply-To: <20200910142335.GG3265@brightrain.aerifal.cx>
From: Rich Felker
> Sent: 10 September 2020 15:24
...
> index 9af548fb841b..570a21f4d81e 100644
> --- a/fs/open.c
> +++ b/fs/open.c
> @@ -610,15 +610,30 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, umode_t, mode)
> return err;
> }
>
> -static int do_fchmodat(int dfd, const char __user *filename, umode_t mode)
> +static int do_fchmodat(int dfd, const char __user *filename, umode_t mode, int flags)
> {
> struct path path;
> int error;
> unsigned int lookup_flags = LOOKUP_FOLLOW;
> +
> + if (flags & AT_SYMLINK_NOFOLLOW)
> + lookup_flags &= ~LOOKUP_FOLLOW;
> + if (flags & ~AT_SYMLINK_NOFOLLOW)
> + return -EINVAL;
I think I'd swap over those two tests.
So unsupported flags are clearly errored.
> retry:
> error = user_path_at(dfd, filename, lookup_flags, &path);
> if (!error) {
> - error = chmod_common(&path, mode);
> + /* Block chmod from getting to fs layer. Ideally the
> + * fs would either allow it or fail with EOPNOTSUPP,
> + * but some are buggy and return an error but change
> + * the mode, which is non-conforming and wrong.
> + * Userspace emulation of AT_SYMLINK_NOFOLLOW in
> + * glibc and musl blocked it too, for same reason. */
> + if (S_ISLNK(path.dentry->d_inode->i_mode)
> + && (flags & AT_SYMLINK_NOFOLLOW))
> + error = -EOPNOTSUPP;
Again swap the order of the tests. I think it reads better as:
if ((flags & AT_SYMLINK_NOFOLLOW)
&& S_ISLNK(path.dentry->d_inode->i_mode))
error = -EOPNOTSUPP;
As well as saving a few clock cycles.
> + else
> + error = chmod_common(&path, mode);
> path_put(&path);
> if (retry_estale(error, lookup_flags)) {
> lookup_flags |= LOOKUP_REVAL;
...
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
next prev parent reply other threads:[~2020-09-10 19:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 14:23 [PATCH] vfs: add fchmodat2 syscall Rich Felker
2020-09-10 15:18 ` Al Viro
2020-09-10 15:45 ` Rich Felker
2020-09-10 15:23 ` David Laight [this message]
2020-09-10 16:16 ` Greg KH
2020-09-10 16:35 ` Rich Felker
2020-09-10 16:20 ` Christoph Hellwig
2020-09-10 16:39 ` Rich Felker
2020-09-10 16:42 ` Christoph Hellwig
2020-09-10 17:02 ` Rich Felker
2020-09-11 6:57 ` Christoph Hellwig
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=1111806ca0344527a8855616e46346c5@AcuMS.aculab.com \
--to=david.laight@aculab.com \
--cc=dalias@libc.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).