mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
18b6e0414e
The user_ns is moved from nsproxy to user_struct, so that a struct
cred by itself is sufficient to determine access (which it otherwise
would not be). Corresponding ecryptfs fixes (by David Howells) are
here as well.
Fix refcounting. The following rules now apply:
1. The task pins the user struct.
2. The user struct pins its user namespace.
3. The user namespace pins the struct user which created it.
User namespaces are cloned during copy_creds(). Unsharing a new user_ns
is no longer possible. (We could re-add that, but it'll cause code
duplication and doesn't seem useful if PAM doesn't need to clone user
namespaces).
When a user namespace is created, its first user (uid 0) gets empty
keyrings and a clean group_info.
This incorporates a previous patch by David Howells. Here
is his original patch description:
>I suggest adding the attached incremental patch. It makes the following
>changes:
>
> (1) Provides a current_user_ns() macro to wrap accesses to current's user
> namespace.
>
> (2) Fixes eCryptFS.
>
> (3) Renames create_new_userns() to create_user_ns() to be more consistent
> with the other associated functions and because the 'new' in the name is
> superfluous.
>
> (4) Moves the argument and permission checks made for CLONE_NEWUSER to the
> beginning of do_fork() so that they're done prior to making any attempts
> at allocation.
>
> (5) Calls create_user_ns() after prepare_creds(), and gives it the new creds
> to fill in rather than have it return the new root user. I don't imagine
> the new root user being used for anything other than filling in a cred
> struct.
>
> This also permits me to get rid of a get_uid() and a free_uid(), as the
> reference the creds were holding on the old user_struct can just be
> transferred to the new namespace's creator pointer.
>
> (6) Makes create_user_ns() reset the UIDs and GIDs of the creds under
> preparation rather than doing it in copy_creds().
>
>David
>Signed-off-by: David Howells <dhowells@redhat.com>
Changelog:
Oct 20: integrate dhowells comments
1. leave thread_keyring alone
2. use current_user_ns() in set_user()
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
71 lines
1.8 KiB
C
71 lines
1.8 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation, version 2 of the
|
|
* License.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/user_namespace.h>
|
|
#include <linux/cred.h>
|
|
|
|
/*
|
|
* Create a new user namespace, deriving the creator from the user in the
|
|
* passed credentials, and replacing that user with the new root user for the
|
|
* new namespace.
|
|
*
|
|
* This is called by copy_creds(), which will finish setting the target task's
|
|
* credentials.
|
|
*/
|
|
int create_user_ns(struct cred *new)
|
|
{
|
|
struct user_namespace *ns;
|
|
struct user_struct *root_user;
|
|
int n;
|
|
|
|
ns = kmalloc(sizeof(struct user_namespace), GFP_KERNEL);
|
|
if (!ns)
|
|
return -ENOMEM;
|
|
|
|
kref_init(&ns->kref);
|
|
|
|
for (n = 0; n < UIDHASH_SZ; ++n)
|
|
INIT_HLIST_HEAD(ns->uidhash_table + n);
|
|
|
|
/* Alloc new root user. */
|
|
root_user = alloc_uid(ns, 0);
|
|
if (!root_user) {
|
|
kfree(ns);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
/* set the new root user in the credentials under preparation */
|
|
ns->creator = new->user;
|
|
new->user = root_user;
|
|
new->uid = new->euid = new->suid = new->fsuid = 0;
|
|
new->gid = new->egid = new->sgid = new->fsgid = 0;
|
|
put_group_info(new->group_info);
|
|
new->group_info = get_group_info(&init_groups);
|
|
#ifdef CONFIG_KEYS
|
|
key_put(new->request_key_auth);
|
|
new->request_key_auth = NULL;
|
|
#endif
|
|
/* tgcred will be cleared in our caller bc CLONE_THREAD won't be set */
|
|
|
|
/* alloc_uid() incremented the userns refcount. Just set it to 1 */
|
|
kref_set(&ns->kref, 1);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void free_user_ns(struct kref *kref)
|
|
{
|
|
struct user_namespace *ns;
|
|
|
|
ns = container_of(kref, struct user_namespace, kref);
|
|
free_uid(ns->creator);
|
|
kfree(ns);
|
|
}
|
|
EXPORT_SYMBOL(free_user_ns);
|