From patchwork Thu Apr 19 13:32:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 10350111 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D92B6023A for ; Thu, 19 Apr 2018 13:33:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E76F28A3A for ; Thu, 19 Apr 2018 13:33:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 115D528A37; Thu, 19 Apr 2018 13:33:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A3DD28A92 for ; Thu, 19 Apr 2018 13:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753148AbeDSNcd (ORCPT ); Thu, 19 Apr 2018 09:32:33 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42838 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753221AbeDSNca (ORCPT ); Thu, 19 Apr 2018 09:32:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5E5C4173BBC; Thu, 19 Apr 2018 13:32:29 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-121-60.rdu2.redhat.com [10.10.121.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3A022026DFD; Thu, 19 Apr 2018 13:32:28 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 12/24] proc: Add fs_context support to procfs [ver #7] From: David Howells To: viro@zeniv.linux.org.uk Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, linux-security-module@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-afs@lists.infradead.org Date: Thu, 19 Apr 2018 14:32:28 +0100 Message-ID: <152414474815.23902.6952548431423168966.stgit@warthog.procyon.org.uk> In-Reply-To: <152414466005.23902.12967974041384198114.stgit@warthog.procyon.org.uk> References: <152414466005.23902.12967974041384198114.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 19 Apr 2018 13:32:29 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 19 Apr 2018 13:32:29 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dhowells@redhat.com' RCPT:'' Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add fs_context support to procfs. Signed-off-by: David Howells --- fs/proc/inode.c | 2 - fs/proc/internal.h | 2 - fs/proc/root.c | 169 ++++++++++++++++++++++++++++++++++------------------ 3 files changed, 113 insertions(+), 60 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 0b13cf6eb6d7..7aa86dd65ba8 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -128,7 +128,7 @@ const struct super_operations proc_sops = { .drop_inode = generic_delete_inode, .evict_inode = proc_evict_inode, .statfs = simple_statfs, - .remount_fs = proc_remount, + .reconfigure = proc_reconfigure, .show_options = proc_show_options, }; diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 3182e1b636d3..a5ab9504768a 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -254,7 +254,7 @@ static inline void proc_tty_init(void) {} extern struct proc_dir_entry proc_root; extern void proc_self_init(void); -extern int proc_remount(struct super_block *, int *, char *, size_t); +extern int proc_reconfigure(struct super_block *, struct fs_context *); /* * task_[no]mmu.c diff --git a/fs/proc/root.c b/fs/proc/root.c index 2fbc177f37a8..e6bd31fbc714 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -19,14 +19,24 @@ #include #include #include +#include #include #include #include #include #include +#include #include "internal.h" +struct proc_fs_context { + struct fs_context fc; + struct pid_namespace *pid_ns; + unsigned long mask; + int hidepid; + int gid; +}; + enum { Opt_gid, Opt_hidepid, Opt_err, }; @@ -37,56 +47,60 @@ static const match_table_t tokens = { {Opt_err, NULL}, }; -static int proc_parse_options(char *options, struct pid_namespace *pid) +static int proc_parse_option(struct fs_context *fc, char *opt, size_t len) { - char *p; + struct proc_fs_context *ctx = container_of(fc, struct proc_fs_context, fc); substring_t args[MAX_OPT_ARGS]; - int option; - - if (!options) - return 1; - - while ((p = strsep(&options, ",")) != NULL) { - int token; - if (!*p) - continue; - - args[0].to = args[0].from = NULL; - token = match_token(p, tokens, args); - switch (token) { - case Opt_gid: - if (match_int(&args[0], &option)) - return 0; - pid->pid_gid = make_kgid(current_user_ns(), option); - break; - case Opt_hidepid: - if (match_int(&args[0], &option)) - return 0; - if (option < HIDEPID_OFF || - option > HIDEPID_INVISIBLE) { - pr_err("proc: hidepid value must be between 0 and 2.\n"); - return 0; - } - pid->hide_pid = option; - break; - default: - pr_err("proc: unrecognized mount option \"%s\" " - "or missing value\n", p); - return 0; + int token; + + args[0].to = args[0].from = NULL; + token = match_token(opt, tokens, args); + switch (token) { + case Opt_gid: + if (match_int(&args[0], &ctx->gid)) + return -EINVAL; + break; + + case Opt_hidepid: + if (match_int(&args[0], &ctx->hidepid)) + return -EINVAL; + if (ctx->hidepid < HIDEPID_OFF || + ctx->hidepid > HIDEPID_INVISIBLE) { + pr_err("proc: hidepid value must be between 0 and 2.\n"); + return -EINVAL; } + break; + + default: + pr_err("proc: unrecognized mount option \"%s\" or missing value\n", + opt); + return -EINVAL; } - return 1; + ctx->mask |= 1 << token; + return 0; +} + +static void proc_set_options(struct super_block *s, + struct fs_context *fc, + struct pid_namespace *pid_ns, + struct user_namespace *user_ns) +{ + struct proc_fs_context *ctx = container_of(fc, struct proc_fs_context, fc); + + if (ctx->mask & (1 << Opt_gid)) + pid_ns->pid_gid = make_kgid(user_ns, ctx->gid); + if (ctx->mask & (1 << Opt_hidepid)) + pid_ns->hide_pid = ctx->hidepid; } -static int proc_fill_super(struct super_block *s, void *data, size_t data_size, int silent) +static int proc_fill_super(struct super_block *s, struct fs_context *fc) { - struct pid_namespace *ns = get_pid_ns(s->s_fs_info); + struct pid_namespace *pid_ns = get_pid_ns(s->s_fs_info); struct inode *root_inode; int ret; - if (!proc_parse_options(data, ns)) - return -EINVAL; + proc_set_options(s, fc, pid_ns, current_user_ns()); /* User space would break if executables or devices appear on proc */ s->s_iflags |= SB_I_USERNS_VISIBLE | SB_I_NOEXEC | SB_I_NODEV; @@ -103,7 +117,7 @@ static int proc_fill_super(struct super_block *s, void *data, size_t data_size, * top of it */ s->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH; - + pde_get(&proc_root); root_inode = proc_get_inode(s, &proc_root); if (!root_inode) { @@ -124,30 +138,46 @@ static int proc_fill_super(struct super_block *s, void *data, size_t data_size, return proc_setup_thread_self(s); } -int proc_remount(struct super_block *sb, int *flags, - char *data, size_t data_size) +int proc_reconfigure(struct super_block *sb, struct fs_context *fc) { struct pid_namespace *pid = sb->s_fs_info; sync_filesystem(sb); - return !proc_parse_options(data, pid); + + if (fc) + proc_set_options(sb, fc, pid, current_user_ns()); + return 0; } -static struct dentry *proc_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, - void *data, size_t data_size) +static int proc_get_tree(struct fs_context *fc) { - struct pid_namespace *ns; + struct proc_fs_context *ctx = container_of(fc, struct proc_fs_context, fc); - if (flags & SB_KERNMOUNT) { - ns = data; - data = NULL; - } else { - ns = task_active_pid_ns(current); - } + ctx->fc.s_fs_info = ctx->pid_ns; + return vfs_get_super(fc, vfs_get_keyed_super, proc_fill_super); +} - return mount_ns(fs_type, flags, data, data_size, ns, ns->user_ns, - proc_fill_super); +static void proc_fs_context_free(struct fs_context *fc) +{ + struct proc_fs_context *ctx = container_of(fc, struct proc_fs_context, fc); + + if (ctx->pid_ns) + put_pid_ns(ctx->pid_ns); +} + +static const struct fs_context_operations proc_fs_context_ops = { + .free = proc_fs_context_free, + .parse_option = proc_parse_option, + .get_tree = proc_get_tree, +}; + +static int proc_init_fs_context(struct fs_context *fc, struct super_block *src_sb) +{ + struct proc_fs_context *ctx = container_of(fc, struct proc_fs_context, fc); + + ctx->pid_ns = get_pid_ns(task_active_pid_ns(current)); + ctx->fc.ops = &proc_fs_context_ops; + return 0; } static void proc_kill_sb(struct super_block *sb) @@ -165,7 +195,8 @@ static void proc_kill_sb(struct super_block *sb) static struct file_system_type proc_fs_type = { .name = "proc", - .mount = proc_mount, + .fs_context_size = sizeof(struct proc_fs_context), + .init_fs_context = proc_init_fs_context, .kill_sb = proc_kill_sb, .fs_flags = FS_USERNS_MOUNT, }; @@ -205,7 +236,7 @@ static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentr { if (!proc_pid_lookup(dir, dentry, flags)) return NULL; - + return proc_lookup(dir, dentry, flags); } @@ -259,9 +290,31 @@ struct proc_dir_entry proc_root = { int pid_ns_prepare_proc(struct pid_namespace *ns) { + struct proc_fs_context *ctx; + struct fs_context *fc; struct vfsmount *mnt; + int ret; + + fc = vfs_new_fs_context(&proc_fs_type, NULL, 0, + FS_CONTEXT_FOR_KERNEL_MOUNT); + if (IS_ERR(fc)) + return PTR_ERR(fc); + + ctx = container_of(fc, struct proc_fs_context, fc); + if (ctx->pid_ns != ns) { + put_pid_ns(ctx->pid_ns); + get_pid_ns(ns); + ctx->pid_ns = ns; + } + + ret = vfs_get_tree(fc); + if (ret < 0) { + put_fs_context(fc); + return ret; + } - mnt = kern_mount_data(&proc_fs_type, ns, 0); + mnt = vfs_create_mount(fc); + put_fs_context(fc); if (IS_ERR(mnt)) return PTR_ERR(mnt);