diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2010-06-12 23:28:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-16 17:55:34 -0400 |
commit | 5c1469de7545a35a16ff2b902e217044a7d2f8a5 (patch) | |
tree | 2a3b48da4dab1516234633ee5e71766801210e49 /kernel | |
parent | 812e876e842488221aa54cb4587a8a33445cfa9e (diff) |
user_ns: Introduce user_nsmap_uid and user_ns_map_gid.
Define what happens when a we view a uid from one user_namespace
in another user_namepece.
- If the user namespaces are the same no mapping is necessary.
- For most cases of difference use overflowuid and overflowgid,
the uid and gid currently used for 16bit apis when we have a 32bit uid
that does fit in 16bits. Effectively the situation is the same,
we want to return a uid or gid that is not assigned to any user.
- For the case when we happen to be mapping the uid or gid of the
creator of the target user namespace use uid 0 and gid as confusing
that user with root is not a problem.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Serge E. Hallyn <serue@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/user_namespace.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index b2d70d38dff4..25915832291a 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/nsproxy.h> | 9 | #include <linux/nsproxy.h> |
10 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
11 | #include <linux/user_namespace.h> | 11 | #include <linux/user_namespace.h> |
12 | #include <linux/highuid.h> | ||
12 | #include <linux/cred.h> | 13 | #include <linux/cred.h> |
13 | 14 | ||
14 | /* | 15 | /* |
@@ -82,3 +83,46 @@ void free_user_ns(struct kref *kref) | |||
82 | schedule_work(&ns->destroyer); | 83 | schedule_work(&ns->destroyer); |
83 | } | 84 | } |
84 | EXPORT_SYMBOL(free_user_ns); | 85 | EXPORT_SYMBOL(free_user_ns); |
86 | |||
87 | uid_t user_ns_map_uid(struct user_namespace *to, const struct cred *cred, uid_t uid) | ||
88 | { | ||
89 | struct user_namespace *tmp; | ||
90 | |||
91 | if (likely(to == cred->user->user_ns)) | ||
92 | return uid; | ||
93 | |||
94 | |||
95 | /* Is cred->user the creator of the target user_ns | ||
96 | * or the creator of one of it's parents? | ||
97 | */ | ||
98 | for ( tmp = to; tmp != &init_user_ns; | ||
99 | tmp = tmp->creator->user_ns ) { | ||
100 | if (cred->user == tmp->creator) { | ||
101 | return (uid_t)0; | ||
102 | } | ||
103 | } | ||
104 | |||
105 | /* No useful relationship so no mapping */ | ||
106 | return overflowuid; | ||
107 | } | ||
108 | |||
109 | gid_t user_ns_map_gid(struct user_namespace *to, const struct cred *cred, gid_t gid) | ||
110 | { | ||
111 | struct user_namespace *tmp; | ||
112 | |||
113 | if (likely(to == cred->user->user_ns)) | ||
114 | return gid; | ||
115 | |||
116 | /* Is cred->user the creator of the target user_ns | ||
117 | * or the creator of one of it's parents? | ||
118 | */ | ||
119 | for ( tmp = to; tmp != &init_user_ns; | ||
120 | tmp = tmp->creator->user_ns ) { | ||
121 | if (cred->user == tmp->creator) { | ||
122 | return (gid_t)0; | ||
123 | } | ||
124 | } | ||
125 | |||
126 | /* No useful relationship so no mapping */ | ||
127 | return overflowgid; | ||
128 | } | ||