Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755973AbbLDRBc (ORCPT ); Fri, 4 Dec 2015 12:01:32 -0500 Received: from h2.hallyn.com ([78.46.35.8]:41817 "EHLO h2.hallyn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754264AbbLDRBa (ORCPT ); Fri, 4 Dec 2015 12:01:30 -0500 Date: Fri, 4 Dec 2015 11:01:27 -0600 From: "Serge E. Hallyn" To: Seth Forshee Cc: "Eric W. Biederman" , Alexander Viro , Serge Hallyn , James Morris , "Serge E. Hallyn" , Richard Weinberger , Austin S Hemmelgarn , Miklos Szeredi , linux-bcache@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, fuse-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov Subject: Re: [PATCH 05/19] userns: Replace in_userns with current_in_userns Message-ID: <20151204170127.GF1722@mail.hallyn.com> References: <1449070821-73820-1-git-send-email-seth.forshee@canonical.com> <1449070821-73820-6-git-send-email-seth.forshee@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1449070821-73820-6-git-send-email-seth.forshee@canonical.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3857 Lines: 93 On Wed, Dec 02, 2015 at 09:40:05AM -0600, Seth Forshee wrote: > All current callers of in_userns pass current_user_ns as the > first argument. Simplify by replacing in_userns with > current_in_userns which checks whether current_user_ns is in the > namespace supplied as an argument. > > Signed-off-by: Seth Forshee > Acked-by: James Morris Acked-by: Serge Hallyn > --- > fs/namespace.c | 2 +- > include/linux/user_namespace.h | 6 ++---- > kernel/user_namespace.c | 6 +++--- > security/commoncap.c | 2 +- > 4 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/fs/namespace.c b/fs/namespace.c > index 2101ce7b96ab..18fc58760aec 100644 > --- a/fs/namespace.c > +++ b/fs/namespace.c > @@ -3286,7 +3286,7 @@ bool mnt_may_suid(struct vfsmount *mnt) > * in other namespaces. > */ > return !(mnt->mnt_flags & MNT_NOSUID) && check_mnt(real_mount(mnt)) && > - in_userns(current_user_ns(), mnt->mnt_sb->s_user_ns); > + current_in_userns(mnt->mnt_sb->s_user_ns); > } > > static struct ns_common *mntns_get(struct task_struct *task) > diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h > index a43faa727124..9217169c64cb 100644 > --- a/include/linux/user_namespace.h > +++ b/include/linux/user_namespace.h > @@ -72,8 +72,7 @@ extern ssize_t proc_projid_map_write(struct file *, const char __user *, size_t, > extern ssize_t proc_setgroups_write(struct file *, const char __user *, size_t, loff_t *); > extern int proc_setgroups_show(struct seq_file *m, void *v); > extern bool userns_may_setgroups(const struct user_namespace *ns); > -extern bool in_userns(const struct user_namespace *ns, > - const struct user_namespace *target_ns); > +extern bool current_in_userns(const struct user_namespace *target_ns); > #else > > static inline struct user_namespace *get_user_ns(struct user_namespace *ns) > @@ -103,8 +102,7 @@ static inline bool userns_may_setgroups(const struct user_namespace *ns) > return true; > } > > -static inline bool in_userns(const struct user_namespace *ns, > - const struct user_namespace *target_ns) > +static inline bool current_in_userns(const struct user_namespace *target_ns) > { > return true; > } > diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c > index 69fbc377357b..5960edc7e644 100644 > --- a/kernel/user_namespace.c > +++ b/kernel/user_namespace.c > @@ -949,10 +949,10 @@ bool userns_may_setgroups(const struct user_namespace *ns) > * Returns true if @ns is the same namespace as or a descendant of > * @target_ns. > */ > -bool in_userns(const struct user_namespace *ns, > - const struct user_namespace *target_ns) > +bool current_in_userns(const struct user_namespace *target_ns) > { > - for (; ns; ns = ns->parent) { > + struct user_namespace *ns; > + for (ns = current_user_ns(); ns; ns = ns->parent) { > if (ns == target_ns) > return true; > } > diff --git a/security/commoncap.c b/security/commoncap.c > index 6243aef5860e..2119421613f6 100644 > --- a/security/commoncap.c > +++ b/security/commoncap.c > @@ -450,7 +450,7 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_c > > if (!mnt_may_suid(bprm->file->f_path.mnt)) > return 0; > - if (!in_userns(current_user_ns(), bprm->file->f_path.mnt->mnt_sb->s_user_ns)) > + if (!current_in_userns(bprm->file->f_path.mnt->mnt_sb->s_user_ns)) > return 0; > > rc = get_vfs_caps_from_disk(bprm->file->f_path.dentry, &vcaps); > -- > 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/