OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

userns: Rename id_map_mutex to userns_state_mutex 

commit f0d62aec93 upstream.

Generalize id_map_mutex so it can be used for more state of a user namespace.

Reviewed-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric W. Biederman 2014-12-09 14:03:14 -06:00 committed by Greg Kroah-Hartman
parent 7faecd49fc
commit 6f3bf1edd0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/user_namespace.c
View File

@ -24,6 +24,7 @@
#include <linux/fs_struct.h> #include <linux/fs_struct.h>
static struct kmem_cache *user_ns_cachep __read_mostly; static struct kmem_cache *user_ns_cachep __read_mostly;
static DEFINE_MUTEX(userns_state_mutex);
static bool new_idmap_permitted(const struct file *file, static bool new_idmap_permitted(const struct file *file,
struct user_namespace *ns, int cap_setid, struct user_namespace *ns, int cap_setid,
@ -581,9 +582,6 @@ static bool mappings_overlap(struct uid_gid_map *new_map, struct uid_gid_extent
return false; return false;
} }
static DEFINE_MUTEX(id_map_mutex);
static ssize_t map_write(struct file *file, const char __user *buf, static ssize_t map_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos, size_t count, loff_t *ppos,
int cap_setid, int cap_setid,
@ -600,7 +598,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
ssize_t ret = -EINVAL; ssize_t ret = -EINVAL;
/* /*
* The id_map_mutex serializes all writes to any given map. * The userns_state_mutex serializes all writes to any given map.
* *
* Any map is only ever written once. * Any map is only ever written once.
* *
@ -618,7 +616,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
* order and smp_rmb() is guaranteed that we don't have crazy * order and smp_rmb() is guaranteed that we don't have crazy
* architectures returning stale data. * architectures returning stale data.
*/ */
mutex_lock(&id_map_mutex); mutex_lock(&userns_state_mutex);
ret = -EPERM; ret = -EPERM;
/* Only allow one successful write to the map */ /* Only allow one successful write to the map */
@ -745,7 +743,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
*ppos = count; *ppos = count;
ret = count; ret = count;
out: out:
mutex_unlock(&id_map_mutex); mutex_unlock(&userns_state_mutex);
if (page) if (page)
free_page(page); free_page(page);
return ret; return ret;
@ -837,12 +835,12 @@ bool userns_may_setgroups(const struct user_namespace *ns)
{ {
bool allowed; bool allowed;
mutex_lock(&id_map_mutex); mutex_lock(&userns_state_mutex);
/* It is not safe to use setgroups until a gid mapping in /* It is not safe to use setgroups until a gid mapping in
* the user namespace has been established. * the user namespace has been established.
*/ */
allowed = ns->gid_map.nr_extents != 0; allowed = ns->gid_map.nr_extents != 0;
mutex_unlock(&id_map_mutex); mutex_unlock(&userns_state_mutex);
return allowed; return allowed;
} }