From: Miklos Szeredi <miklos@szeredi.hu>
To: David Howells <dhowells@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Miklos Szeredi <mszeredi@redhat.com>, Ian Kent <raven@themaw.net>,
Linux API <linux-api@vger.kernel.org>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 01/13] vfs: verify param type in vfs_parse_sb_flag()
Date: Mon, 1 Jul 2019 10:45:53 +0200 [thread overview]
Message-ID: <CAJfpegv_ezsXOLV2f7yd07=T3MenJoMKhu=MBac1-80s0BFg9A@mail.gmail.com> (raw)
In-Reply-To: <20190619123019.30032-1-mszeredi@redhat.com>
Hi David,
Ping? Have you had a chance of looking at this series?
Köszi,
Miklos
On Wed, Jun 19, 2019 at 2:30 PM Miklos Szeredi <mszeredi@redhat.com> wrote:
>
> vfs_parse_sb_flag() accepted any kind of param with a matching key, not
> just a flag. This is wrong, only allow flag type and return -EINVAL
> otherwise.
>
> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
> ---
> fs/fs_context.c | 31 +++++++++++++++----------------
> 1 file changed, 15 insertions(+), 16 deletions(-)
>
> diff --git a/fs/fs_context.c b/fs/fs_context.c
> index 103643c68e3f..e56310fd8c75 100644
> --- a/fs/fs_context.c
> +++ b/fs/fs_context.c
> @@ -81,30 +81,29 @@ static const char *const forbidden_sb_flag[] = {
> /*
> * Check for a common mount option that manipulates s_flags.
> */
> -static int vfs_parse_sb_flag(struct fs_context *fc, const char *key)
> +static int vfs_parse_sb_flag(struct fs_context *fc, struct fs_parameter *param)
> {
> - unsigned int token;
> + const char *key = param->key;
> + unsigned int set, clear;
> unsigned int i;
>
> for (i = 0; i < ARRAY_SIZE(forbidden_sb_flag); i++)
> if (strcmp(key, forbidden_sb_flag[i]) == 0)
> return -EINVAL;
>
> - token = lookup_constant(common_set_sb_flag, key, 0);
> - if (token) {
> - fc->sb_flags |= token;
> - fc->sb_flags_mask |= token;
> - return 0;
> - }
> + set = lookup_constant(common_set_sb_flag, key, 0);
> + clear = lookup_constant(common_clear_sb_flag, key, 0);
> + if (!set && !clear)
> + return -ENOPARAM;
>
> - token = lookup_constant(common_clear_sb_flag, key, 0);
> - if (token) {
> - fc->sb_flags &= ~token;
> - fc->sb_flags_mask |= token;
> - return 0;
> - }
> + if (param->type != fs_value_is_flag)
> + return invalf(fc, "%s: Unexpected value for '%s'",
> + fc->fs_type->name, param->key);
>
> - return -ENOPARAM;
> + fc->sb_flags |= set;
> + fc->sb_flags &= ~clear;
> + fc->sb_flags_mask |= set | clear;
> + return 0;
> }
>
> /**
> @@ -130,7 +129,7 @@ int vfs_parse_fs_param(struct fs_context *fc, struct fs_parameter *param)
> if (!param->key)
> return invalf(fc, "Unnamed parameter\n");
>
> - ret = vfs_parse_sb_flag(fc, param->key);
> + ret = vfs_parse_sb_flag(fc, param);
> if (ret != -ENOPARAM)
> return ret;
>
> --
> 2.21.0
>
next prev parent reply other threads:[~2019-07-01 8:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 12:30 [PATCH 01/13] vfs: verify param type in vfs_parse_sb_flag() Miklos Szeredi
2019-06-19 12:30 ` [PATCH 02/13] vfs: move vfs_parse_sb_flag() calls into filesystems Miklos Szeredi
2019-06-19 12:30 ` [PATCH 03/13] vfs: don't parse forbidden flags Miklos Szeredi
2019-06-19 12:30 ` [PATCH 04/13] vfs: don't parse "posixacl" option Miklos Szeredi
2019-06-19 12:30 ` [PATCH 05/13] vfs: don't parse "silent" option Miklos Szeredi
2019-06-20 4:40 ` Ian Kent
2019-06-24 8:25 ` Miklos Szeredi
2019-06-24 10:36 ` David Howells
2019-06-24 10:44 ` Miklos Szeredi
2019-06-24 10:53 ` Miklos Szeredi
2019-06-19 12:30 ` [PATCH 06/13] vfs: new helper: vfs_parse_ro_rw() Miklos Szeredi
2019-06-19 12:30 ` [PATCH 07/13] proc: don't ignore options Miklos Szeredi
2019-06-19 12:30 ` [PATCH 08/13] sysfs: " Miklos Szeredi
2019-06-19 12:30 ` [PATCH 09/13] mqueue: " Miklos Szeredi
2019-06-19 12:30 ` [PATCH 10/13] cpuset: " Miklos Szeredi
2019-06-19 12:30 ` [PATCH 11/13] cgroup: " Miklos Szeredi
2019-06-19 12:30 ` [PATCH 12/13] fusectl: " Miklos Szeredi
2019-06-19 12:30 ` [PATCH 13/13] resctrl: " Miklos Szeredi
2019-07-01 8:45 ` Miklos Szeredi [this message]
2019-07-04 16:19 ` [PATCH 01/13] vfs: verify param type in vfs_parse_sb_flag() David Howells
2019-09-06 7:28 ` Miklos Szeredi
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='CAJfpegv_ezsXOLV2f7yd07=T3MenJoMKhu=MBac1-80s0BFg9A@mail.gmail.com' \
--to=miklos@szeredi.hu \
--cc=dhowells@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mszeredi@redhat.com \
--cc=raven@themaw.net \
--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).