From: Jarkko Sakkinen <jarkko@kernel.org>
To: linux-fsdevel@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>,
bpf@vger.kernel.org, containers@lists.linux.dev,
linux-api@vger.kernel.org, linux-arch@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-mm@kvack.org,
linux-security-module@vger.kernel.org,
Aleksa Sarai <aleksa@amutable.com>,
Alexander Mikhalitsyn <alex@amutable.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Andy Lutomirski <luto@amacapital.net>,
Arnd Bergmann <arnd@arndb.de>,
Christian Brauner <brauner@kernel.org>,
David Howells <dhowells@redhat.com>,
Eric Biggers <ebiggers@kernel.org>,
Giuseppe Scrivano <giuseppe@scrivano.org>,
Hugh Dickins <hughd@google.com>, Jan Kara <jack@suse.cz>,
Jeff Layton <jlayton@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Josef Bacik <josef@toxicpanda.com>, Kees Cook <kees@kernel.org>,
KP Singh <kpsingh@kernel.org>,
Lennart Poettering <lennart@poettering.net>,
Neal Gompa <neal@gompa.dev>, Oleg Nesterov <oleg@redhat.com>,
Paul Moore <paul@paul-moore.com>,
Pavel Tikhomirov <ptikhomirov@virtuozzo.com>,
Serge Hallyn <sergeh@kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>,
Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Subject: [RFC PATCH v7 18/26] fs: Support FSCONFIG_SET_USERLAND in fsconfig()
Date: Sun, 22 Nov 2026 21:35:31 +0200 [thread overview]
Message-ID: <20261122193539.3334213-19-jarkko@kernel.org> (raw)
In-Reply-To: <20261122193539.3334213-1-jarkko@kernel.org>
fsopen() and fsmount() gate on CAP_SYS_ADMIN in the caller's current
mount namespace and initialize filesystem contexts from current's user
and network namespaces, preventing an unprivileged external manager from
creating superblocks and detached mounts for an unentered userland.
Add FSCONFIG_SET_USERLAND and the ->set_userland() fs_context operation
so callers holding CAP_SYS_ADMIN in the target userland's user namespace
can bind a newly opened fs_context to that userland once before offering
parameters. Gate userland context binding on explicit FS_USERLAND_MOUNT
opt-in (or FS_USERNS_DELEGATABLE), mark tmpfs, ramfs, and devpts with
FS_USERLAND_MOUNT, refresh fc->cred when FSCONFIG_SET_USERLAND
authorizes and initializes the context, and keep devpts pty_reserve
restricted to host mounts.
Co-developed-by: David Howells <dhowells@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
Documentation/filesystems/mount_api.rst | 32 +++++-
fs/devpts/inode.c | 4 +-
fs/filesystems.c | 15 +++
fs/fs_context.c | 21 +++-
fs/fsopen.c | 137 ++++++++++++++++++++++--
fs/internal.h | 6 ++
fs/namespace.c | 18 +++-
fs/ramfs/inode.c | 2 +-
include/linux/fs.h | 1 +
include/linux/fs_context.h | 6 ++
include/uapi/linux/mount.h | 1 +
mm/shmem.c | 5 +-
12 files changed, 229 insertions(+), 19 deletions(-)
diff --git a/Documentation/filesystems/mount_api.rst b/Documentation/filesystems/mount_api.rst
index e8b94357b4df..55edc9fdd6fd 100644
--- a/Documentation/filesystems/mount_api.rst
+++ b/Documentation/filesystems/mount_api.rst
@@ -80,6 +80,7 @@ context. This is represented by the fs_context structure::
unsigned int sb_flags_mask;
unsigned int s_iflags;
enum fs_context_purpose purpose:8;
+ bool userland_bound:1;
...
};
@@ -123,7 +124,8 @@ The fs_context fields are as follows:
There are a subset of the namespaces in use by the invoking process. They
retain references on each namespace. The subscribed namespaces may be
replaced by the filesystem to reflect other sources, such as the parent
- mount superblock on an automount.
+ mount superblock on an automount, or to the target userland's
+ namespaces when bound via FSCONFIG_SET_USERLAND.
* ::
@@ -186,6 +188,15 @@ The fs_context fields are as follows:
FS_CONTEXT_FOR_RECONFIGURE Change an existing mount
========================== ======================================
+ * ::
+
+ bool userland_bound:1
+
+ Set when the filesystem context has been bound to a target userland via
+ FSCONFIG_SET_USERLAND. Filesystems may inspect this flag (for example in
+ ->init_fs_context() or ->parse_param()) to distinguish userland-delegated
+ mounts from host mounts.
+
The mount context is created by calling vfs_new_fs_context() or
vfs_dup_fs_context() and is destroyed with put_fs_context(). Note that the
structure is not refcounted.
@@ -214,6 +225,8 @@ The filesystem context points to a table of operations::
int (*parse_param)(struct fs_context *fc,
struct fs_parameter *param);
int (*parse_monolithic)(struct fs_context *fc, void *data);
+ int (*set_userland)(struct fs_context *fc,
+ struct userland *userland);
int (*get_tree)(struct fs_context *fc);
int (*reconfigure)(struct fs_context *fc);
};
@@ -272,6 +285,23 @@ manage the filesystem context. They are as follows:
finds it's the standard key-val list then it may pass it off to
generic_parse_monolithic().
+ * ::
+
+ int (*set_userland)(struct fs_context *fc,
+ struct userland *userland);
+
+ Called by FSCONFIG_SET_USERLAND after updating fc->user_ns, fc->net_ns,
+ and fc->cred, setting fc->userland_bound, and re-running
+ ->init_fs_context(). Filesystems opting into FS_USERLAND_MOUNT (or
+ FS_USERNS_DELEGATABLE) that capture additional namespaces from current in
+ ->init_fs_context() (such as PID or IPC namespaces) can implement this
+ operation to rebind their private context to the target userland's
+ namespaces. It may update fc->user_ns, which must equal userland->user_ns
+ on return or the bind fails with -EOPNOTSUPP.
+
+ On success it should return 0. In the case of an error, it should return
+ a negative error code and the context transitions to FS_CONTEXT_FAILED.
+
* ::
int (*get_tree)(struct fs_context *fc);
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index bd1e8eb26edb..921b67d18fa2 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -434,6 +434,8 @@ static int devpts_init_fs_context(struct fs_context *fc)
fsi->mount_opts.max = NR_UNIX98_PTY_MAX;
if (fc->purpose == FS_CONTEXT_FOR_MOUNT &&
+ !fc->userland_bound &&
+ fc->user_ns == &init_user_ns &&
current->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns)
fsi->mount_opts.reserve = true;
@@ -457,7 +459,7 @@ static struct file_system_type devpts_fs_type = {
.init_fs_context = devpts_init_fs_context,
.parameters = devpts_param_specs,
.kill_sb = devpts_kill_sb,
- .fs_flags = FS_USERNS_MOUNT,
+ .fs_flags = FS_USERNS_MOUNT | FS_USERLAND_MOUNT,
};
/*
diff --git a/fs/filesystems.c b/fs/filesystems.c
index 3083d904df9b..9429844bf6bf 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -18,6 +18,7 @@
#include <linux/uaccess.h>
#include <linux/fs_parser.h>
#include <linux/rculist.h>
+#include "internal.h"
/*
* Read-mostly filesystem drivers list.
@@ -390,6 +391,20 @@ static struct file_system_type *__get_fs_type(const char *name, int len)
return fs;
}
+struct file_system_type *get_fs_type_noload(const char *name)
+{
+ struct file_system_type *fs;
+ const char *dot = strchr(name, '.');
+ int len = dot ? dot - name : strlen(name);
+
+ fs = __get_fs_type(name, len);
+ if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
+ put_filesystem(fs);
+ fs = NULL;
+ }
+ return fs;
+}
+
struct file_system_type *get_fs_type(const char *name)
{
struct file_system_type *fs;
diff --git a/fs/fs_context.c b/fs/fs_context.c
index a50584df97be..cd004750b99c 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -249,6 +249,7 @@ EXPORT_SYMBOL(generic_parse_monolithic);
* @sb_flags: Filesystem/superblock flags (SB_*)
* @sb_flags_mask: Applicable members of @sb_flags
* @purpose: The purpose that this configuration shall be used for.
+ * @init: Whether to initialise the filesystem context immediately.
*
* Open a filesystem and create a mount context. The mount context is
* initialised with the supplied flags and, if a submount/automount from
@@ -259,7 +260,8 @@ static struct fs_context *alloc_fs_context(struct file_system_type *fs_type,
struct dentry *reference,
unsigned int sb_flags,
unsigned int sb_flags_mask,
- enum fs_context_purpose purpose)
+ enum fs_context_purpose purpose,
+ bool init)
{
struct fs_context *fc;
int ret = -ENOMEM;
@@ -292,6 +294,9 @@ static struct fs_context *alloc_fs_context(struct file_system_type *fs_type,
break;
}
+ if (!init)
+ return fc;
+
ret = fc->fs_type->init_fs_context(fc);
if (ret < 0)
goto err_fc;
@@ -307,10 +312,16 @@ struct fs_context *fs_context_for_mount(struct file_system_type *fs_type,
unsigned int sb_flags)
{
return alloc_fs_context(fs_type, NULL, sb_flags, 0,
- FS_CONTEXT_FOR_MOUNT);
+ FS_CONTEXT_FOR_MOUNT, true);
}
EXPORT_SYMBOL(fs_context_for_mount);
+struct fs_context *fs_context_for_unpriv_mount(struct file_system_type *fs_type)
+{
+ return alloc_fs_context(fs_type, NULL, 0, 0,
+ FS_CONTEXT_FOR_MOUNT, false);
+}
+
struct fs_context *fs_context_for_reconfigure(struct dentry *dentry,
unsigned int sb_flags,
unsigned int sb_flags_mask)
@@ -320,7 +331,8 @@ struct fs_context *fs_context_for_reconfigure(struct dentry *dentry,
return ERR_PTR(-EINVAL);
return alloc_fs_context(dentry->d_sb->s_type, dentry, sb_flags,
- sb_flags_mask, FS_CONTEXT_FOR_RECONFIGURE);
+ sb_flags_mask, FS_CONTEXT_FOR_RECONFIGURE,
+ true);
}
/**
@@ -337,7 +349,8 @@ struct fs_context *fs_context_for_submount(struct file_system_type *type,
struct fs_context *fc;
int ret;
- fc = alloc_fs_context(type, reference, 0, 0, FS_CONTEXT_FOR_SUBMOUNT);
+ fc = alloc_fs_context(type, reference, 0, 0, FS_CONTEXT_FOR_SUBMOUNT,
+ true);
if (IS_ERR(fc))
return fc;
diff --git a/fs/fsopen.c b/fs/fsopen.c
index 70024870fefa..33cc9163c670 100644
--- a/fs/fsopen.c
+++ b/fs/fsopen.c
@@ -13,9 +13,14 @@
#include <linux/security.h>
#include <linux/anon_inodes.h>
#include <linux/namei.h>
+#include <linux/capability.h>
+#include <linux/nsproxy.h>
+#include <linux/userland.h>
+#include <linux/user_namespace.h>
#include <linux/file.h>
#include <uapi/linux/mount.h>
#include <linux/audit.h>
+#include <net/net_namespace.h>
#include "internal.h"
#include "mount.h"
@@ -41,6 +46,92 @@ static inline const char *fetch_message_locked(struct fc_log *log, size_t len,
return p;
}
+/**
+ * DOC: FSCONFIG_SET_USERLAND
+ *
+ * ``fsconfig(fsfd, FSCONFIG_SET_USERLAND, NULL, NULL, userland_fd)`` binds a newly
+ * opened ``FS_USERLAND_MOUNT`` or ``FS_USERNS_DELEGATABLE`` filesystem context
+ * to ``userland_fd`` once before parameters are supplied. Requires
+ * ``CAP_SYS_ADMIN`` in the userland's user namespace and binds the context to the
+ * userland's user, network, PID (``proc``), and IPC (``mqueue``) namespaces.
+ */
+static int fsconfig_set_userland(struct fs_context *fc, struct fs_parameter *param)
+{
+ struct user_namespace *user_ns;
+ struct net *net;
+ struct userland *c;
+ int ret;
+
+ if (!userland_is_file(param->file))
+ return -EINVAL;
+
+ c = param->file->private_data;
+ user_ns = c->user_ns;
+ if (!ns_capable(user_ns, CAP_SYS_ADMIN))
+ return -EPERM;
+ if (!(fc->fs_type->fs_flags &
+ (FS_USERLAND_MOUNT | FS_USERNS_DELEGATABLE)))
+ return -EOPNOTSUPP;
+
+ if (fc->need_free && fc->ops && fc->ops->free)
+ fc->ops->free(fc);
+ fc->need_free = false;
+ fc->fs_private = NULL;
+ fc->s_fs_info = NULL;
+ fc->ops = NULL;
+ fc->sb_flags = 0;
+ fc->global = false;
+ security_free_mnt_opts(&fc->security);
+
+ if (fc->log.prefix && strcmp(fc->fs_type->name, fc->log.prefix)) {
+ struct file_system_type *orig;
+
+ orig = get_fs_type_noload(fc->log.prefix);
+ if (!orig) {
+ fc->phase = FS_CONTEXT_FAILED;
+ return -ENODEV;
+ }
+ put_filesystem(fc->fs_type);
+ fc->fs_type = orig;
+ }
+
+ scoped_guard(spinlock, &c->lock)
+ net = get_net(c->ns->net_ns);
+ put_cred(fc->cred);
+ fc->cred = get_current_cred();
+ put_net(fc->net_ns);
+ fc->net_ns = net;
+ put_user_ns(fc->user_ns);
+ fc->user_ns = get_user_ns(user_ns);
+
+ fc->userland_bound = true;
+ fc->userland_mnt_id = c->ns->mnt_ns->ns.ns_id;
+
+ ret = fc->fs_type->init_fs_context(fc);
+ if (ret < 0) {
+ fc->userland_bound = false;
+ fc->phase = FS_CONTEXT_FAILED;
+ return ret;
+ }
+ fc->need_free = true;
+
+ if (fc->ops->set_userland) {
+ ret = fc->ops->set_userland(fc, c);
+ if (ret < 0) {
+ fc->userland_bound = false;
+ fc->phase = FS_CONTEXT_FAILED;
+ return ret;
+ }
+ }
+ if (fc->user_ns != user_ns) {
+ fc->userland_bound = false;
+ fc->phase = FS_CONTEXT_FAILED;
+ return -EOPNOTSUPP;
+ }
+ fc->phase = FS_CONTEXT_CREATE_PARAMS;
+ return 0;
+}
+
/*
* Allow the user to read back any error, warning or informational messages.
* Only one message is returned for each read(2) call.
@@ -123,9 +214,11 @@ SYSCALL_DEFINE2(fsopen, const char __user *, _fs_name, unsigned int, flags)
struct file_system_type *fs_type;
struct fs_context *fc;
const char *fs_name;
+ bool priv;
int ret;
- if (!may_mount())
+ priv = may_mount();
+ if (!priv && !IS_ENABLED(CONFIG_USERLAND))
return -EPERM;
if (flags & ~FSOPEN_CLOEXEC)
@@ -137,17 +230,23 @@ SYSCALL_DEFINE2(fsopen, const char __user *, _fs_name, unsigned int, flags)
audit_log_fsopen(fs_name);
- fs_type = get_fs_type(fs_name);
+ fs_type = priv ? get_fs_type(fs_name) : get_fs_type_noload(fs_name);
kfree(fs_name);
if (!fs_type)
- return -ENODEV;
+ return priv ? -ENODEV : -EPERM;
+
+ if (!priv && !(fs_type->fs_flags & FS_USERLAND_MOUNT)) {
+ put_filesystem(fs_type);
+ return -EPERM;
+ }
- fc = fs_context_for_mount(fs_type, 0);
+ fc = priv ? fs_context_for_mount(fs_type, 0) :
+ fs_context_for_unpriv_mount(fs_type);
put_filesystem(fs_type);
if (IS_ERR(fc))
return PTR_ERR(fc);
- fc->phase = FS_CONTEXT_CREATE_PARAMS;
+ fc->phase = priv ? FS_CONTEXT_CREATE_NS : FS_CONTEXT_AWAITING_NS;
ret = fscontext_alloc_log(fc);
if (ret < 0)
@@ -222,7 +321,8 @@ static int vfs_cmd_create(struct fs_context *fc, bool exclusive)
struct super_block *sb;
int ret;
- if (fc->phase != FS_CONTEXT_CREATE_PARAMS)
+ if (fc->phase != FS_CONTEXT_CREATE_NS &&
+ fc->phase != FS_CONTEXT_CREATE_PARAMS)
return -EBUSY;
if (!mount_capable(fc))
@@ -291,6 +391,8 @@ static int vfs_fsconfig_locked(struct fs_context *fc, int cmd,
ret = finish_clean_context(fc);
if (ret)
return ret;
+ if (fc->phase == FS_CONTEXT_AWAITING_NS && cmd != FSCONFIG_SET_USERLAND)
+ return -EPERM;
switch (cmd) {
case FSCONFIG_CMD_CREATE:
return vfs_cmd_create(fc, false);
@@ -298,9 +400,17 @@ static int vfs_fsconfig_locked(struct fs_context *fc, int cmd,
return vfs_cmd_create(fc, true);
case FSCONFIG_CMD_RECONFIGURE:
return vfs_cmd_reconfigure(fc);
+ case FSCONFIG_SET_USERLAND:
+ if (fc->phase != FS_CONTEXT_AWAITING_NS &&
+ fc->phase != FS_CONTEXT_CREATE_NS)
+ return -EBUSY;
+ return fsconfig_set_userland(fc, param);
+
default:
- if (fc->phase != FS_CONTEXT_CREATE_PARAMS &&
- fc->phase != FS_CONTEXT_RECONF_PARAMS)
+ if (fc->phase == FS_CONTEXT_CREATE_NS)
+ fc->phase = FS_CONTEXT_CREATE_PARAMS;
+ else if (fc->phase != FS_CONTEXT_CREATE_PARAMS &&
+ fc->phase != FS_CONTEXT_RECONF_PARAMS)
return -EBUSY;
return vfs_parse_fs_param(fc, param);
@@ -390,6 +500,10 @@ SYSCALL_DEFINE5(fsconfig,
if (!_key || _value || aux < 0)
return -EINVAL;
break;
+ case FSCONFIG_SET_USERLAND:
+ if (_key || _value || aux < 0)
+ return -EINVAL;
+ break;
case FSCONFIG_CMD_CREATE:
case FSCONFIG_CMD_CREATE_EXCL:
case FSCONFIG_CMD_RECONFIGURE:
@@ -457,6 +571,12 @@ SYSCALL_DEFINE5(fsconfig,
goto out_key;
param.dirfd = aux;
break;
+ case FSCONFIG_SET_USERLAND:
+ ret = -EBADF;
+ param.file = fget(aux);
+ if (!param.file)
+ goto out_key;
+ break;
default:
break;
}
@@ -482,6 +602,7 @@ SYSCALL_DEFINE5(fsconfig,
putname(param.name);
break;
case FSCONFIG_SET_FD:
+ case FSCONFIG_SET_USERLAND:
if (param.file)
fput(param.file);
break;
diff --git a/fs/internal.h b/fs/internal.h
index ee3f796241ac..c7b57263ac83 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -40,12 +40,18 @@ int __block_write_begin_int(struct folio *folio, loff_t pos, unsigned len,
*/
extern void __init chrdev_init(void);
+/*
+ * filesystems.c
+ */
+struct file_system_type *get_fs_type_noload(const char *name);
+
/*
* fs_context.c
*/
extern int parse_monolithic_mount_data(struct fs_context *, void *);
extern void vfs_clean_context(struct fs_context *fc);
extern int finish_clean_context(struct fs_context *fc);
+struct fs_context *fs_context_for_unpriv_mount(struct file_system_type *fs_type);
/*
* namei.c
diff --git a/fs/namespace.c b/fs/namespace.c
index b2c89ad2393e..18534cd2d601 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -4716,7 +4716,8 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,
!ns_capable(current_user_ns(), CAP_SYS_ADMIN))
return -EPERM;
- if (!(flags & FSMOUNT_NAMESPACE) && !may_mount())
+ if (!(flags & FSMOUNT_NAMESPACE) && !IS_ENABLED(CONFIG_USERLAND) &&
+ !may_mount())
return -EPERM;
if (attr_flags & ~FSMOUNT_VALID_FLAGS)
@@ -4751,6 +4752,16 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,
if (ret)
return ret;
+ if (fc->userland_bound) {
+ if (flags & FSMOUNT_NAMESPACE)
+ return -EINVAL;
+ if (!ns_capable(fc->user_ns, CAP_SYS_ADMIN))
+ return -EPERM;
+ } else if (!(flags & FSMOUNT_NAMESPACE) &&
+ IS_ENABLED(CONFIG_USERLAND) && !may_mount()) {
+ return -EPERM;
+ }
+
/* There must be a valid superblock or we can't mount it */
ret = -EINVAL;
if (!fc->root)
@@ -4792,9 +4803,12 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,
return FD_ADD((flags & FSMOUNT_CLOEXEC) ? O_CLOEXEC : 0,
open_new_namespace(&new_path, MOUNT_COPY_NEW));
- ns = alloc_mnt_ns(current->nsproxy->mnt_ns->user_ns, true);
+ ns = alloc_mnt_ns(fc->userland_bound ? fc->user_ns :
+ current->nsproxy->mnt_ns->user_ns, true);
if (IS_ERR(ns))
return PTR_ERR(ns);
+ if (fc->userland_bound)
+ ns->seq_origin = fc->userland_mnt_id;
mnt = real_mount(new_path.mnt);
ns->root = mnt;
ns->nr_mounts = 1;
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index ef91b933d4e6..d15542145704 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -319,7 +319,7 @@ static struct file_system_type ramfs_fs_type = {
.init_fs_context = ramfs_init_fs_context,
.parameters = ramfs_fs_parameters,
.kill_sb = ramfs_kill_sb,
- .fs_flags = FS_USERNS_MOUNT,
+ .fs_flags = FS_USERNS_MOUNT | FS_USERLAND_MOUNT,
};
static int __init init_ramfs_fs(void)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5b3a100aba77..afb514600372 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2306,6 +2306,7 @@ struct file_system_type {
#define FS_USERNS_MOUNT_RESTRICTED 512 /* Restrict mount in userns if not already visible */
#define FS_USERNS_DELEGATABLE 1024 /* Can be mounted inside userns from outside */
#define FS_DISALLOW_NOTIFY 2048 /* No fsnotify marks on its objects */
+#define FS_USERLAND_MOUNT 4096 /* Supports FSCONFIG_SET_USERLAND */
#define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during rename() internally. */
int (*init_fs_context)(struct fs_context *);
const struct fs_parameter_spec *parameters;
diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h
index d1727dffecc5..a98e5a40d54c 100644
--- a/include/linux/fs_context.h
+++ b/include/linux/fs_context.h
@@ -23,6 +23,7 @@ struct net;
struct pid_namespace;
struct super_block;
struct user_namespace;
+struct userland;
struct vfsmount;
struct path;
@@ -36,6 +37,8 @@ enum fs_context_purpose {
* Userspace usage phase for fsopen/fspick.
*/
enum fs_context_phase {
+ FS_CONTEXT_AWAITING_NS, /* Unprivileged context awaiting target ns */
+ FS_CONTEXT_CREATE_NS, /* Set namespaces for sb creation */
FS_CONTEXT_CREATE_PARAMS, /* Loading params for sb creation */
FS_CONTEXT_CREATING, /* A superblock is being created */
FS_CONTEXT_AWAITING_MOUNT, /* Superblock created, awaiting fsmount() */
@@ -101,6 +104,7 @@ struct fs_context {
const char *source; /* The source name (eg. dev path) */
void *security; /* LSM options */
void *s_fs_info; /* Proposed s_fs_info */
+ u64 userland_mnt_id; /* Target userland mnt_ns ID */
unsigned int sb_flags; /* Proposed superblock flags (SB_*) */
unsigned int sb_flags_mask; /* Superblock flags that were changed */
unsigned int s_iflags; /* OR'd with sb->s_iflags */
@@ -110,6 +114,7 @@ struct fs_context {
bool global:1; /* Goes into &init_user_ns */
bool oldapi:1; /* Coming from mount(2) */
bool exclusive:1; /* create new superblock, reject existing one */
+ bool userland_bound:1; /* Bound via FSCONFIG_SET_USERLAND */
};
struct fs_context_operations {
@@ -117,6 +122,7 @@ struct fs_context_operations {
int (*dup)(struct fs_context *fc, struct fs_context *src_fc);
int (*parse_param)(struct fs_context *fc, struct fs_parameter *param);
int (*parse_monolithic)(struct fs_context *fc, void *data);
+ int (*set_userland)(struct fs_context *fc, struct userland *userland);
int (*get_tree)(struct fs_context *fc);
int (*reconfigure)(struct fs_context *fc);
};
diff --git a/include/uapi/linux/mount.h b/include/uapi/linux/mount.h
index cb4f7175db02..4c70c0183f5e 100644
--- a/include/uapi/linux/mount.h
+++ b/include/uapi/linux/mount.h
@@ -107,6 +107,7 @@ enum fsconfig_command {
FSCONFIG_CMD_CREATE = 6, /* Create new or reuse existing superblock */
FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
FSCONFIG_CMD_CREATE_EXCL = 8, /* Create new superblock, fail if reusing existing superblock */
+ FSCONFIG_SET_USERLAND = 9, /* Set target userland, supplied by fd */
};
/*
diff --git a/mm/shmem.c b/mm/shmem.c
index 10cef89b00b0..61503304be6b 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -5592,7 +5592,8 @@ static struct file_system_type shmem_fs_type = {
.parameters = shmem_fs_parameters,
#endif
.kill_sb = kill_anon_super,
- .fs_flags = FS_USERNS_MOUNT | FS_ALLOW_IDMAP | FS_MGTIME,
+ .fs_flags = FS_USERNS_MOUNT | FS_USERLAND_MOUNT |
+ FS_ALLOW_IDMAP | FS_MGTIME,
};
#if defined(CONFIG_SYSFS) && defined(CONFIG_TMPFS)
@@ -6021,7 +6022,7 @@ static struct file_system_type shmem_fs_type = {
.init_fs_context = ramfs_init_fs_context,
.parameters = ramfs_fs_parameters,
.kill_sb = ramfs_kill_sb,
- .fs_flags = FS_USERNS_MOUNT,
+ .fs_flags = FS_USERNS_MOUNT | FS_USERLAND_MOUNT,
};
void __init shmem_init(void)
--
2.47.3
next prev parent reply other threads:[~2026-11-22 19:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-22 19:35 [RFC PATCH v7 00/26] userland: Userland containers Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 01/26] userns: Factor out idmap validation and commit helpers Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 02/26] userns: Add userns_set_idmap() system call Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 03/26] arch: Wire up " Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 04/26] mount: Add mnt_ns_get_root() Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 05/26] mount: Enforce mount_too_revealing() for foreign mntns Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 06/26] mount: Support MOVE_MOUNT_T_MNTNS in move_mount() Jarkko Sakkinen
2026-11-22 20:02 ` sashiko-bot
2026-11-22 19:35 ` [RFC PATCH v7 07/26] mount: Support MOVE_MOUNT_CLONE with MOVE_MOUNT_T_MNTNS Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 08/26] userns: Factor out install_user_ns_cred() Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 09/26] nsproxy: Expose create_new_namespaces() Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 10/26] userland: Add core infrastructure Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 11/26] userland: Track init lifecycle via copy_process() and pid_namespace Jarkko Sakkinen
2026-11-22 20:09 ` bot+bpf-ci
2026-11-22 19:35 ` [RFC PATCH v7 12/26] userland: Add userland_open() system call Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 13/26] userland: Add USERLAND_GET_NSFD ioctl Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 14/26] userland: Add USERLAND_SHARE_NSFD ioctl Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 15/26] exit: Support P_USERLAND in waitid() Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 16/26] signal: Support userland fds in pidfd_send_signal() Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 17/26] fork: Support CLONE_INTO_USERLAND in clone3() Jarkko Sakkinen
2026-11-22 20:01 ` sashiko-bot
2026-11-22 19:35 ` Jarkko Sakkinen [this message]
2026-11-22 19:58 ` [RFC PATCH v7 18/26] fs: Support FSCONFIG_SET_USERLAND in fsconfig() sashiko-bot
2026-11-22 19:35 ` [RFC PATCH v7 19/26] proc: Implement ->set_userland() fs_context operation Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 20/26] ipc/mqueue: " Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 21/26] security: Add userland LSM hooks Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 22/26] bpf: Register " Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 23/26] arch: Wire up userland_open() system call Jarkko Sakkinen
2026-11-22 19:35 ` [RFC PATCH v7 24/26] docs: Document userland uAPI Jarkko Sakkinen
2026-11-22 20:09 ` bot+bpf-ci
2026-11-22 19:35 ` [RFC PATCH v7 25/26] selftests/userland: Add userland test suite Jarkko Sakkinen
2026-11-22 19:52 ` sashiko-bot
2026-11-22 19:35 ` [RFC PATCH v7 26/26] MAINTAINERS: Add entry for USERLAND Jarkko Sakkinen
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=20261122193539.3334213-19-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=aleksa@amutable.com \
--cc=alex@amutable.com \
--cc=arnd@arndb.de \
--cc=bpf@vger.kernel.org \
--cc=brauner@kernel.org \
--cc=containers@lists.linux.dev \
--cc=corbet@lwn.net \
--cc=dhowells@redhat.com \
--cc=ebiggers@kernel.org \
--cc=giuseppe@scrivano.org \
--cc=hughd@google.com \
--cc=jack@suse.cz \
--cc=jlayton@kernel.org \
--cc=josef@toxicpanda.com \
--cc=kees@kernel.org \
--cc=kpsingh@kernel.org \
--cc=lennart@poettering.net \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=neal@gompa.dev \
--cc=oleg@redhat.com \
--cc=paul@paul-moore.com \
--cc=ptikhomirov@virtuozzo.com \
--cc=sergeh@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=zygmunt.krynicki@canonical.com \
/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