From: Al Viro <viro@ZenIV.linux.org.uk>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Aleksa Sarai <asarai@suse.de>,
linux-kernel@vger.kernel.org,
containers@lists.linux-foundation.org
Subject: Re: [PATCH 1/2] fs: Extend mount_ns with support for a fast namespace to vfsmount function
Date: Fri, 23 Mar 2018 23:15:11 +0000 [thread overview]
Message-ID: <20180323231511.GK30522@ZenIV.linux.org.uk> (raw)
In-Reply-To: <87fu4qo4ff.fsf_-_@xmission.com>
On Fri, Mar 23, 2018 at 04:41:40PM -0500, Eric W. Biederman wrote:
> struct dentry *mount_ns(struct file_system_type *fs_type,
> int flags, void *data, void *ns, struct user_namespace *user_ns,
> + struct vfsmount *(*ns_to_mnt)(void *ns),
> int (*fill_super)(struct super_block *, void *, int))
> {
> struct super_block *sb;
> -
> + int (*test_super)(struct super_block *, void *) = ns_test_super;
> /* Don't allow mounting unless the caller has CAP_SYS_ADMIN
> * over the namespace.
> */
> if (!(flags & SB_KERNMOUNT) && !ns_capable(user_ns, CAP_SYS_ADMIN))
> return ERR_PTR(-EPERM);
>
> - sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,
> - user_ns, ns);
> + if (ns_to_mnt) {
> + test_super = NULL;
> + if (!(flags & SB_KERNMOUNT)) {
> + struct vfsmount *m = ns_to_mnt(ns);
> + if (IS_ERR(m))
> + return ERR_CAST(m);
> + atomic_inc(&m->mnt_sb->s_active);
> + down_write(&m->mnt_sb->s_umount);
> + return dget(m->mnt_root);
This is completely wrong. Look:
* SB_KERNMOUNT and !SB_KERNMOUNT cases are almost entirely isolated;
completely so once that ns_to_mnt becomes unconditionally non-NULL.
* in !SB_KERNMOUNT passing ns_to_mnt() is pointless - you might as
well pass existing vfsmount (or ERR_PTR()) and use _that_. fill_super()
is not used at all in that case.
* is SB_KERNMOUNT ns_to_mnt serves only as a flag, eventually
constant true.
So let's split it in two helpers and give them sane arguments.
next prev parent reply other threads:[~2018-03-23 23:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 6:04 [REGRESSION v4.16-rc6] [PATCH] mqueue: forbid unprivileged user access to internal mount Aleksa Sarai
2018-03-23 6:04 ` Aleksa Sarai
2018-03-23 6:31 ` Eric W. Biederman
2018-03-23 6:31 ` Eric W. Biederman
[not found] ` <87k1u3ti9e.fsf-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org>
2018-03-23 21:41 ` [PATCH 1/2] fs: Extend mount_ns with support for a fast namespace to vfsmount function Eric W. Biederman
2018-03-23 21:41 ` Eric W. Biederman
[not found] ` <87fu4qo4ff.fsf_-_-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org>
2018-03-23 21:43 ` [PATCH 2/2] mqueuefs: Fix the permissions and permission checks when mounting mqueuefs Eric W. Biederman
2018-03-23 23:15 ` [PATCH 1/2] fs: Extend mount_ns with support for a fast namespace to vfsmount function Al Viro
2018-03-23 21:43 ` [PATCH 2/2] mqueuefs: Fix the permissions and permission checks when mounting mqueuefs Eric W. Biederman
2018-03-23 23:15 ` Al Viro [this message]
2018-03-24 16:12 ` [PATCH 1/2] fs: Extend mount_ns with support for a fast namespace to vfsmount function Eric W. Biederman
[not found] ` <87in9ljvvx.fsf-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org>
2018-03-24 21:48 ` Al Viro
2018-03-24 21:48 ` Al Viro
[not found] ` <20180324214845.GM30522-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2018-03-25 1:25 ` [GIT PULL] Revert "mqueue: switch to on-demand creation of internal mount" Eric W. Biederman
2018-03-25 1:25 ` Eric W. Biederman
[not found] ` <20180323231511.GK30522-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2018-03-24 16:12 ` [PATCH 1/2] fs: Extend mount_ns with support for a fast namespace to vfsmount function Eric W. Biederman
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=20180323231511.GK30522@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=asarai@suse.de \
--cc=containers@lists.linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.