From: Miklos Szeredi <mszeredi@redhat.com>
To: David Howells <dhowells@redhat.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/6] mount: fix regression in setting "subtype" from legacy API
Date: Thu, 20 Sep 2018 17:12:11 +0200 [thread overview]
Message-ID: <20180920151214.15484-4-mszeredi@redhat.com> (raw)
In-Reply-To: <20180920151214.15484-1-mszeredi@redhat.com>
Subtype was initilized at the wrong place from the wrong source
(fstype->fs_type->name, which does not ever contain a subtype).
Set subtype from do_new_mount(), where it actually does something.
Verified with fuse.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---
fs/fs_context.c | 34 ----------------------------------
fs/namespace.c | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/fs/fs_context.c b/fs/fs_context.c
index ceaf42559016..c0ecbb1ecdfe 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -684,27 +684,6 @@ static int legacy_validate(struct fs_context *fc)
ctx->secdata);
}
-/*
- * Determine the superblock subtype.
- */
-static int legacy_set_subtype(struct fs_context *fc)
-{
- const char *subtype = strchr(fc->fs_type->name, '.');
-
- if (subtype) {
- subtype++;
- if (!subtype[0])
- return -EINVAL;
- } else {
- subtype = "";
- }
-
- fc->subtype = kstrdup(subtype, GFP_KERNEL);
- if (!fc->subtype)
- return -ENOMEM;
- return 0;
-}
-
/*
* Get a mountable root with the legacy mount command.
*/
@@ -713,7 +692,6 @@ static int legacy_get_tree(struct fs_context *fc)
struct legacy_fs_context *ctx = fc->fs_private;
struct super_block *sb;
struct dentry *root;
- int ret;
root = fc->fs_type->mount(fc->fs_type, fc->sb_flags,
fc->source, ctx->legacy_data,
@@ -724,20 +702,8 @@ static int legacy_get_tree(struct fs_context *fc)
sb = root->d_sb;
BUG_ON(!sb);
- if ((fc->fs_type->fs_flags & FS_HAS_SUBTYPE) &&
- !fc->subtype) {
- ret = legacy_set_subtype(fc);
- if (ret < 0)
- goto err_sb;
- }
-
fc->root = root;
return 0;
-
-err_sb:
- dput(root);
- deactivate_locked_super(sb);
- return ret;
}
/*
diff --git a/fs/namespace.c b/fs/namespace.c
index 865b6f2c5e7d..7671c1f6fc22 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2617,6 +2617,7 @@ static int do_new_mount(struct path *mountpoint, const char *fstype,
{
struct file_system_type *fs_type;
struct fs_context *fc;
+ const char *subtype = NULL;
int err;
if (!fstype)
@@ -2627,6 +2628,19 @@ static int do_new_mount(struct path *mountpoint, const char *fstype,
if (!fs_type)
goto out;
+ if (fs_type->fs_flags & FS_HAS_SUBTYPE) {
+ subtype = strchr(fstype, '.');
+ if (subtype) {
+ subtype++;
+ if (!subtype[0]) {
+ put_filesystem(fs_type);
+ return -EINVAL;
+ }
+ } else {
+ subtype = "";
+ }
+ }
+
fc = vfs_new_fs_context(fs_type, NULL, sb_flags, sb_flags,
FS_CONTEXT_FOR_USER_MOUNT);
put_filesystem(fs_type);
@@ -2635,6 +2649,13 @@ static int do_new_mount(struct path *mountpoint, const char *fstype,
goto out;
}
+ if (subtype) {
+ fc->subtype = kstrdup(subtype, GFP_KERNEL);
+ err = -ENOMEM;
+ if (!fc->subtype)
+ goto out;
+ }
+
if (name) {
err = vfs_parse_fs_string(fc, "source", name, strlen(name));
if (err < 0)
--
2.14.3
next prev parent reply other threads:[~2018-09-20 15:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-20 15:12 [PATCH 0/6] mount-api: fixes and cleanups Miklos Szeredi
2018-09-20 15:12 ` [PATCH 1/6] selinux: fold superblock_doinit() into only caller Miklos Szeredi
2018-09-20 15:12 ` [PATCH 2/6] vfs_submount: use SB_SUBMOUNT instead of MS_SUBMOUNT Miklos Szeredi
2018-09-20 15:12 ` Miklos Szeredi [this message]
2018-09-20 15:12 ` [PATCH 4/6] fsconfig: parse "subtype" param for old internal API Miklos Szeredi
2018-09-20 15:12 ` [PATCH 5/6] fsmount: do not use legacy MS_ flags Miklos Szeredi
2018-09-20 15:12 ` [PATCH 6/6] fsconfig: rename FSCONFIG_CMD_CREATE to FSCONFIG_CMD_OBTAIN Miklos Szeredi
2018-09-21 14:41 ` [PATCH 1/6] selinux: fold superblock_doinit() into only caller David Howells
2018-09-21 14:45 ` [PATCH 2/6] vfs_submount: use SB_SUBMOUNT instead of MS_SUBMOUNT David Howells
2018-09-21 14:52 ` [PATCH 3/6] mount: fix regression in setting "subtype" from legacy API David Howells
2018-09-21 14:56 ` [PATCH 4/6] fsconfig: parse "subtype" param for old internal API David Howells
2018-09-21 15:07 ` [PATCH 5/6] fsmount: do not use legacy MS_ flags David Howells
2018-09-21 15:28 ` Miklos Szeredi
2018-09-21 15:37 ` David Howells
2018-09-21 15:54 ` Christian Brauner
2018-09-21 16:52 ` David Howells
2018-09-22 13:21 ` Christian Brauner
2018-09-22 15:48 ` David Howells
2018-09-22 16:14 ` Christian Brauner
2018-09-23 22:45 ` David Howells
2018-09-23 23:01 ` Christian Brauner
2018-09-24 6:50 ` David Howells
2018-09-24 9:47 ` Christian Brauner
2018-09-24 12:37 ` David Howells
2018-09-24 13:18 ` Christian Brauner
2018-09-21 15:11 ` [PATCH 6/6] fsconfig: rename FSCONFIG_CMD_CREATE to FSCONFIG_CMD_OBTAIN David Howells
2018-09-21 15:23 ` Miklos Szeredi
2018-09-21 16:44 ` [PATCH 0/6] mount-api: fixes and cleanups David Howells
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=20180920151214.15484-4-mszeredi@redhat.com \
--to=mszeredi@redhat.com \
--cc=dhowells@redhat.com \
--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).