| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 4 Oct 2017 13:20:09 +0200
From: Christian Brauner <christian.brauner@...ntu.com>
To: ebiederm@...ssion.com, serge@...lyn.com, stgraber@...ntu.com,
linux-kernel@...r.kernel.org, tycho@...h.ws
Cc: Christian Brauner <christian.brauner@...ntu.com>
Subject: [PATCH] user namespaces: bump idmap limits
We have quite some use cases where users already run into the current limit for
{g,u}id mappings. Consider a user requesting us to map everything but 999, and
1001 for a given range of 1000000000 with a sub{g,u}id layout of:
some-user:100000:1000000000
some-user:999:1
some-user:1000:1
some-user:1001:1
some-user:1002:1
This translates to:
MAPPING-TYPE CONTAINER HOST RANGE
uid 999 999 1
uid 1001 1001 1
uid 0 1000000 999
uid 1000 1001000 1
uid 1002 1001002 999998998
gid 999 999 1
gid 1001 1001 1
gid 0 1000000 999
gid 1000 1001000 1
gid 1002 1001002 999998998
which is already the current limit.
Design Notes:
As discussed at LPC simply bumping the number of limits is not going to work
since this would mean that struct uid_gid_map won't fit into a single cache-line
anymore thereby regressing performance for the base-cases. The same problem
seems to arise when using a single pointer. So the idea is to keep the base
cases (0-3 mappings) directly in struct uid_gid_map so they fit into a single
cache-line of 64 byte. For the two removed mappings we place three pointers in
the struct that mock the behavior of traditional filesystems:
1. a direct pointer to a struct uid_gid_extent of 5 mappings of 60 bytes
2. an indirect pointer to an array of 64 byte of direct pointers to struct
uid_gid_extent of 5 mappings a 60 bytes each
3. a double indirect pointer to an array of 64 bytes of indirect pointers each
to an array of 64 bytes of direct pointers (and so on)
Fixing a pointer size of 8 byte this gives us 3 + 5 + (8 * 5) + (8 * (8 * 5)) =
368 mappings which should really be enough. The idea of this approach is to
always have each extent of idmaps (struct uid_gid_extent) be 60 bytes (5 * (4 +
4 + 4) and thus 4 bytes smaller than the size of a single cache line. This
should only see a (i.e. linear) performance impact caused by iterating through
the idmappings in a for-loop. Note that the base cases shouldn't see any
performance degradation which is the most important part.
Performance Testing:
When Eric introduced the extent-based struct uid_gid_map approach he measured
the performanc impact of his idmap changes:
> My benchmark consisted of going to single user mode where nothing else was
> running. On an ext4 filesystem opening 1,000,000 files and looping through all
> of the files 1000 times and calling fstat on the individuals files. This was
> to ensure I was benchmarking stat times where the inodes were in the kernels
> cache, but the inode values were not in the processors cache. My results:
> v3.4-rc1: ~= 156ns (unmodified v3.4-rc1 with user namespace support disabled)
> v3.4-rc1-userns-: ~= 155ns (v3.4-rc1 with my user namespace patches and user namespace support disabled)
> v3.4-rc1-userns+: ~= 164ns (v3.4-rc1 with my user namespace patches and user namespace support enabled)
I used an identical approach on my laptop. Here's a thorough description of what
I did. I built three kernels and used an additional "control" kernel:
1. v4.14-rc2-vanilla (unmodified v4.14-rc2)
2. v4.14-rc2-userns+ (v4.14-rc2 with my new user namespace idmap limits patch)
3. v4.14-rc2-userns- (v4.14-rc2 without my new user namespace idmap limits patch)
4. v4.12.0-12-generic (v4.12.0-12 standard Ubuntu kernel)
I booted into single user mode (systemd rescue target in newspeak) and used an
ext4 filesystem to open/create 1,000,000 files. Then I looped through all of the
files calling fstat() on each of them 1000 times and calculated the mean fstat()
time for a single file. (The test program can be found below.)
For kernels v4.14-rc2-vanilla, v4.12.0-12-generic I tested the following cases:
0 mappings
1 mapping
2 mappings
3 mappings
5 mappings
For kernel v4.4-rc2-userns+ I tested:
0 mappings
1 mapping
2 mappings
3 mappings
5 mappings
10 mappings
50 mappings
100 mappings
200 mappings
300 mappings
Here are the results:
- v4.14-rc2-vanilla (unmodified v4.14-rc2)
# no unshare: 312 ns
unshare -U # write 0 mappings: 307 ns
unshare -U # write 1 mappings: 328 ns
unshare -U # write 2 mappings: 328 ns
unshare -U # write 3 mappings: 328 ns
unshare -U # write 5 mappings: 338 ns
- v4.14-rc2-userns+ (v4.14-rc2 with my new user namespace idmap limits patch)
# no unshare: 158 ns
unshare -U # write 0 mappings: 158 ns
unshare -U # write 1 mappings: 164 ns
unshare -U # write 2 mappings: 170 ns
unshare -U # write 3 mappings: 175 ns
unshare -U # write 5 mappings: 187 ns
unshare -U # write 10 mappings: 218 ns
unshare -U # write 50 mappings: 528 ns
unshare -U # write 100 mappings: 980 ns
unshare -U # write 200 mappings: 1880 ns
unshare -U # write 300 mappings: 2760 ns
- v3.4-rc1-userns-: ~= 155ns (v3.4-rc1 with my user namespace patches and user namespace support disabled)
# no unshare: 161 ns
- 4.12.0-12-generic Ubuntu Kernel:
# no unshare: 328 ns
unshare -U # write 0 mappings: 327 ns
unshare -U # write 1 mappings: 328 ns
unshare -U # write 2 mappings: 328 ns
unshare -U # write 3 mappings: 328 ns
unshare -U # write 5 mappings: 338 ns
I've tested this multiple times and the numbers hold up. All v4.14-rc2 kernels
were built on the same machine with the same .config, the same options and a
simple call to make -j 11 bindeb-pkg. The 4.12 kernel was simply installed from
the Ubuntu archives.
The most import part seems to me that my idmap patches don't regress performance
for the base-cases. I'd actually only consider 0 and 1 mapping to be the proper
base cases since this is the standard layout that users usually expect when
using user namespaces. However, the numbers show that even up to 5 mappings
there's no real performance regression.
When writing more than 10 mappings the numbers nicely show that in the worst
case the performance degrades linearly which is what I was aiming for. To me
this even seems unrelated to cache misses but is rather related to how for-loops
usually scale which is a good sign (I think.).
I expect most users will usually go slightly over the 5 mappings mark up to 10
mappings. For example, when the administrator runs a system container that
serves as a number of users where each of them will want to be able to mount
their home directory in the container and create files with their own uid and
gid. I've used this specific system container setup before on HPC clusters.
The really high idmap numbers are good to have for specific use cases. I have a
bunch of containers that punch various complex holes into idmap ranges to
guarantee safe access for a high number of programs that run with their own uid
on the host and in the container. LXD's idmapping algorithm is able to calculate
complex idmaps that are handed down to the LIBLXC driver.
Here's the test program I used. I asked Eric what he did and this is a more
"advanced" implementation of the idea. It's pretty straight-forward:
/*
* Copyright © 2017 Christian Brauner <christian.brauner@...ntu.com>.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2, as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
int main(int argc, char *argv[])
{
int ret;
size_t i, k;
int fd[1000000];
int times[1000];
char pathname[4096];
struct stat st;
struct timeval t1, t2;
uint64_t time_in_mcs;
uint64_t sum = 0;
if (argc != 2) {
fprintf(stderr, "Please specify a directory where to create "
"the test files\n");
exit(EXIT_FAILURE);
}
for (i = 0; i < sizeof(fd) / sizeof(fd[0]); i++) {
sprintf(pathname, "%s/idmap_test_%zu", argv[1], i);
fd[i]= open(pathname, O_RDWR | O_CREAT, S_IXUSR | S_IXGRP | S_IXOTH);
if (fd[i] < 0) {
ssize_t j;
for (j = i; j >= 0; j--)
close(fd[j]);
exit(EXIT_FAILURE);
}
}
for (k = 0; k < 1000; k++) {
ret = gettimeofday(&t1, NULL);
if (ret < 0)
goto close_all;
for (i = 0; i < sizeof(fd) / sizeof(fd[0]); i++) {
ret = fstat(fd[i], &st);
if (ret < 0)
goto close_all;
}
ret = gettimeofday(&t2, NULL);
if (ret < 0)
goto close_all;
time_in_mcs = (1000000 * t2.tv_sec + t2.tv_usec) -
(1000000 * t1.tv_sec + t1.tv_usec);
printf("Total time in micro seconds: %" PRIu64 "\n",
time_in_mcs);
printf("Total time in nanoseconds: %" PRIu64 "\n",
time_in_mcs * 1000);
printf("Time per file in nanoseconds: %" PRIu64 "\n",
(time_in_mcs * 1000) / 1000000);
times[k] = (time_in_mcs * 1000) / 1000000;
}
close_all:
for (i = 0; i < sizeof(fd) / sizeof(fd[0]); i++)
close(fd[i]);
if (ret < 0)
exit(EXIT_FAILURE);
for (k = 0; k < 1000; k++)
sum += times[k];
printf("Mean time per file in nanoseconds: %" PRIu64 "\n", sum / 1000);
exit(EXIT_SUCCESS);;
}
Signed-off-by: Christian Brauner <christian.brauner@...ntu.com>
---
include/linux/user_namespace.h | 18 ++-
kernel/user_namespace.c | 264 ++++++++++++++++++++++++++++++++++++++---
2 files changed, 263 insertions(+), 19 deletions(-)
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index c18e01252346..66e218c289b3 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -10,15 +10,29 @@
#include <linux/sysctl.h>
#include <linux/err.h>
+#define UID_GID_MAP_PTR_SIZE 8
#define UID_GID_MAP_MAX_EXTENTS 5
+#define UID_GID_MAP_BASE 3
+#define UID_GID_MAP_DIRECT UID_GID_MAP_MAX_EXTENTS
+#define UID_GID_MAP_IDIRECT (UID_GID_MAP_MAX_EXTENTS * UID_GID_MAP_PTR_SIZE)
+#define UID_GID_MAP_DIDIRECT (UID_GID_MAP_IDIRECT * UID_GID_MAP_PTR_SIZE)
+#define UID_GID_MAP_MAX \
+ (UID_GID_MAP_BASE + UID_GID_MAP_DIRECT + UID_GID_MAP_IDIRECT + \
+ UID_GID_MAP_DIDIRECT)
struct uid_gid_map { /* 64 bytes -- 1 cache line */
- u32 nr_extents;
+ /* Pointer to an extent of size UID_GID_MAP_MAX_EXTENTS */
+ struct uid_gid_extent *direct;
+ /* Pointer to a 64 byte array of 8 direct pointers. */
+ struct uid_gid_extent **idirect;
+ /* Pointer to a 64 byte array of 8 idirect pointers. */
+ struct uid_gid_extent ***didirect;
struct uid_gid_extent {
u32 first;
u32 lower_first;
u32 count;
- } extent[UID_GID_MAP_MAX_EXTENTS];
+ } extent[3];
+ u32 nr_extents;
};
#define USERNS_SETGROUPS_ALLOWED 1UL
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index c490f1e4313b..739d880aff39 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -24,6 +24,11 @@
#include <linux/projid.h>
#include <linux/fs_struct.h>
+#define UID_GID_MAP_BASE_MAX UID_GID_MAP_BASE
+#define UID_GID_MAP_DIRECT_MAX (UID_GID_MAP_BASE_MAX + UID_GID_MAP_MAX_EXTENTS)
+#define UID_GID_MAP_IDIRECT_MAX (UID_GID_MAP_IDIRECT + UID_GID_MAP_DIRECT_MAX)
+#define UID_GID_MAP_DIDIRECT_MAX (UID_GID_MAP_DIDIRECT + UID_GID_MAP_IDIRECT_MAX)
+
static struct kmem_cache *user_ns_cachep __read_mostly;
static DEFINE_MUTEX(userns_state_mutex);
@@ -173,6 +178,78 @@ int unshare_userns(unsigned long unshare_flags, struct cred **new_cred)
return err;
}
+/* Get indeces for an extent. */
+static inline u32 get_eidx(u32 idx)
+{
+ /*
+ * Subtract 3 to adjust for missing 2 extents in the main {g,u}idmap
+ * struct.
+ */
+ return ((idx - UID_GID_MAP_MAX_EXTENTS - 3) % UID_GID_MAP_MAX_EXTENTS);
+}
+
+/* Get indeces for the direct pointer. */
+static inline u32 get_didx(u32 idx)
+{
+ return idx - UID_GID_MAP_BASE_MAX;
+}
+
+/* Get indeces for the indirect pointer. */
+static inline u32 get_iidx(u32 idx)
+{
+ if (idx < UID_GID_MAP_IDIRECT_MAX)
+ return (idx - UID_GID_MAP_DIRECT_MAX) / UID_GID_MAP_MAX_EXTENTS;
+
+ return ((idx - UID_GID_MAP_IDIRECT_MAX) / UID_GID_MAP_MAX_EXTENTS) %
+ UID_GID_MAP_PTR_SIZE;
+}
+
+/* Get indeces for the double indirect pointer. */
+static inline u32 get_diidx(u32 idx)
+{
+ return (idx - UID_GID_MAP_IDIRECT_MAX) /
+ (UID_GID_MAP_PTR_SIZE * UID_GID_MAP_MAX_EXTENTS);
+}
+
+static void free_extents(struct uid_gid_map *maps)
+{
+ u32 diidx, i, idx, iidx;
+
+ if (!maps->direct)
+ return;
+ kfree(maps->direct);
+ maps->direct = NULL;
+
+ if (!maps->idirect)
+ return;
+
+ if (maps->nr_extents >= UID_GID_MAP_IDIRECT_MAX)
+ iidx = get_iidx(UID_GID_MAP_IDIRECT_MAX - 1);
+ else
+ iidx = get_iidx(maps->nr_extents - 1);
+ for (idx = 0; idx <= iidx; idx++)
+ kfree(maps->idirect[idx]);
+ kfree(maps->idirect);
+ maps->idirect = NULL;
+
+ if (!maps->didirect)
+ return;
+
+ diidx = get_diidx(maps->nr_extents - 1);
+ iidx = (64 / UID_GID_MAP_PTR_SIZE) - 1;
+ for (idx = 0; idx <= diidx; idx++) {
+ if (idx == diidx)
+ iidx = get_iidx(maps->nr_extents - 1);
+
+ for (i = 0; i <= iidx; i++)
+ kfree(maps->didirect[idx][i]);
+
+ kfree(maps->didirect[idx]);
+ }
+ kfree(maps->didirect);
+ maps->didirect = NULL;
+}
+
static void free_user_ns(struct work_struct *work)
{
struct user_namespace *parent, *ns =
@@ -185,6 +262,12 @@ static void free_user_ns(struct work_struct *work)
#ifdef CONFIG_PERSISTENT_KEYRINGS
key_put(ns->persistent_keyring_register);
#endif
+ mutex_lock(&userns_state_mutex);
+ free_extents(&ns->uid_map);
+ free_extents(&ns->gid_map);
+ free_extents(&ns->projid_map);
+ mutex_unlock(&userns_state_mutex);
+
ns_free_inum(&ns->ns);
kmem_cache_free(user_ns_cachep, ns);
dec_user_namespaces(ucounts);
@@ -198,8 +281,36 @@ void __put_user_ns(struct user_namespace *ns)
}
EXPORT_SYMBOL(__put_user_ns);
+static struct uid_gid_extent *get_idmap(struct uid_gid_map *maps, u32 idx)
+{
+ if (idx < UID_GID_MAP_BASE_MAX)
+ return &maps->extent[idx];
+
+ if ((idx >= UID_GID_MAP_BASE_MAX) &&
+ (idx < UID_GID_MAP_DIRECT_MAX))
+ return &maps->direct[get_didx(idx)];
+
+ if ((idx >= UID_GID_MAP_DIRECT_MAX) &&
+ (idx < UID_GID_MAP_IDIRECT_MAX)) {
+ u32 iidx = get_iidx(idx);
+ u32 eidx = get_eidx(idx);
+ return &maps->idirect[iidx][eidx];
+ }
+
+ if ((idx >= UID_GID_MAP_IDIRECT_MAX) &&
+ (idx < UID_GID_MAP_DIDIRECT_MAX)) {
+ u32 diidx = get_diidx(idx);
+ u32 iidx = get_iidx(idx);
+ u32 eidx = get_eidx(idx);
+ return &maps->didirect[diidx][iidx][eidx];
+ }
+
+ return NULL;
+}
+
static u32 map_id_range_down(struct uid_gid_map *map, u32 id, u32 count)
{
+ struct uid_gid_extent *extent;
unsigned idx, extents;
u32 first, last, id2;
@@ -209,15 +320,16 @@ static u32 map_id_range_down(struct uid_gid_map *map, u32 id, u32 count)
extents = map->nr_extents;
smp_rmb();
for (idx = 0; idx < extents; idx++) {
- first = map->extent[idx].first;
- last = first + map->extent[idx].count - 1;
+ extent = get_idmap(map, idx);
+ first = extent->first;
+ last = first + extent->count - 1;
if (id >= first && id <= last &&
(id2 >= first && id2 <= last))
break;
}
/* Map the id or note failure */
if (idx < extents)
- id = (id - first) + map->extent[idx].lower_first;
+ id = (id - first) + extent->lower_first;
else
id = (u32) -1;
@@ -226,6 +338,7 @@ static u32 map_id_range_down(struct uid_gid_map *map, u32 id, u32 count)
static u32 map_id_down(struct uid_gid_map *map, u32 id)
{
+ struct uid_gid_extent *extent;
unsigned idx, extents;
u32 first, last;
@@ -233,14 +346,15 @@ static u32 map_id_down(struct uid_gid_map *map, u32 id)
extents = map->nr_extents;
smp_rmb();
for (idx = 0; idx < extents; idx++) {
- first = map->extent[idx].first;
- last = first + map->extent[idx].count - 1;
+ extent = get_idmap(map, idx);
+ first = extent->first;
+ last = first + extent->count - 1;
if (id >= first && id <= last)
break;
}
/* Map the id or note failure */
if (idx < extents)
- id = (id - first) + map->extent[idx].lower_first;
+ id = (id - first) + extent->lower_first;
else
id = (u32) -1;
@@ -249,6 +363,7 @@ static u32 map_id_down(struct uid_gid_map *map, u32 id)
static u32 map_id_up(struct uid_gid_map *map, u32 id)
{
+ struct uid_gid_extent *extent;
unsigned idx, extents;
u32 first, last;
@@ -256,14 +371,15 @@ static u32 map_id_up(struct uid_gid_map *map, u32 id)
extents = map->nr_extents;
smp_rmb();
for (idx = 0; idx < extents; idx++) {
- first = map->extent[idx].lower_first;
- last = first + map->extent[idx].count - 1;
+ extent = get_idmap(map, idx);
+ first = extent->lower_first;
+ last = first + extent->count - 1;
if (id >= first && id <= last)
break;
}
/* Map the id or note failure */
if (idx < extents)
- id = (id - first) + map->extent[idx].first;
+ id = (id - first) + extent->first;
else
id = (u32) -1;
@@ -544,7 +660,7 @@ static void *m_start(struct seq_file *seq, loff_t *ppos,
loff_t pos = *ppos;
if (pos < map->nr_extents)
- extent = &map->extent[pos];
+ extent = get_idmap(map, pos);
return extent;
}
@@ -618,7 +734,7 @@ static bool mappings_overlap(struct uid_gid_map *new_map,
u32 prev_upper_last, prev_lower_last;
struct uid_gid_extent *prev;
- prev = &new_map->extent[idx];
+ prev = get_idmap(new_map, idx);
prev_upper_first = prev->first;
prev_lower_first = prev->lower_first;
@@ -638,6 +754,110 @@ static bool mappings_overlap(struct uid_gid_map *new_map,
return false;
}
+static struct uid_gid_extent *alloc_extent(struct uid_gid_map *maps)
+{
+ void *tmp;
+ u32 next = maps->nr_extents;
+ u32 eidx, iidx, ldiidx, diidx, liidx;
+
+ if (next < UID_GID_MAP_BASE_MAX)
+ return &maps->extent[next];
+
+ if ((next >= UID_GID_MAP_BASE_MAX) && (next < UID_GID_MAP_DIRECT_MAX)) {
+ if (!maps->direct)
+ maps->direct = kzalloc(sizeof(struct uid_gid_extent) *
+ UID_GID_MAP_MAX_EXTENTS,
+ GFP_KERNEL);
+ if (!maps->direct)
+ return ERR_PTR(-ENOMEM);
+
+ return &maps->direct[next - UID_GID_MAP_BASE_MAX];
+ }
+
+ if ((next >= UID_GID_MAP_DIRECT_MAX) &&
+ (next < UID_GID_MAP_IDIRECT_MAX)) {
+ liidx = 0;
+ iidx = get_iidx(next);
+ eidx = get_eidx(next);
+
+ if (iidx > 0)
+ liidx = get_iidx(next - 1);
+
+ if (!maps->idirect || iidx > liidx) {
+ tmp = krealloc(maps->idirect,
+ sizeof(struct uid_gid_extent *) * (iidx + 1),
+ GFP_KERNEL);
+ if (!tmp)
+ return ERR_PTR(-ENOMEM);
+
+ maps->idirect = tmp;
+ maps->idirect[iidx] = NULL;
+ }
+
+ tmp = krealloc(maps->idirect[iidx],
+ sizeof(struct uid_gid_extent) * (eidx + 1),
+ GFP_KERNEL);
+ if (!tmp)
+ return ERR_PTR(-ENOMEM);
+
+ maps->idirect[iidx] = tmp;
+ memset(&maps->idirect[iidx][eidx], 0,
+ sizeof(struct uid_gid_extent));
+
+ return &maps->idirect[iidx][eidx];
+ }
+
+ if (next >= UID_GID_MAP_IDIRECT_MAX &&
+ next < UID_GID_MAP_DIDIRECT_MAX) {
+ ldiidx = 0;
+ diidx = get_diidx(next);
+ liidx = 0;
+ iidx = get_iidx(next);
+ eidx = get_eidx(next);
+
+ if (diidx > 0)
+ ldiidx = get_diidx(next - 1);
+
+ if (iidx > 0)
+ liidx = get_iidx(next - 1);
+
+ if (!maps->didirect || diidx > ldiidx) {
+ tmp = krealloc(maps->didirect, sizeof(struct uid_gid_extent **) *
+ (diidx + 1),
+ GFP_KERNEL);
+ if (!tmp)
+ return ERR_PTR(-ENOMEM);
+ maps->didirect = tmp;
+ maps->didirect[diidx] = NULL;
+ }
+
+ if (!maps->didirect[diidx] || iidx > liidx) {
+ tmp = krealloc(maps->didirect[diidx],
+ sizeof(struct uid_gid_extent *) * (iidx + 1),
+ GFP_KERNEL);
+ if (!tmp)
+ return ERR_PTR(-ENOMEM);
+
+ maps->didirect[diidx] = tmp;
+ maps->didirect[diidx][iidx] = NULL;
+ }
+
+ tmp = krealloc(maps->didirect[diidx][iidx],
+ sizeof(struct uid_gid_extent) * (eidx + 1),
+ GFP_KERNEL);
+ if (!tmp)
+ return ERR_PTR(-ENOMEM);
+
+ maps->didirect[diidx][iidx] = tmp;
+ memset(&maps->didirect[diidx][iidx][eidx], 0,
+ sizeof(struct uid_gid_extent));
+
+ return &maps->didirect[diidx][iidx][eidx];
+ }
+
+ return ERR_PTR(-ENOMEM);
+}
+
static ssize_t map_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos,
int cap_setid,
@@ -672,6 +892,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
* architectures returning stale data.
*/
mutex_lock(&userns_state_mutex);
+ memset(&new_map, 0, sizeof(new_map));
ret = -EPERM;
/* Only allow one successful write to the map */
@@ -702,7 +923,11 @@ static ssize_t map_write(struct file *file, const char __user *buf,
pos = kbuf;
new_map.nr_extents = 0;
for (; pos; pos = next_line) {
- extent = &new_map.extent[new_map.nr_extents];
+ extent = alloc_extent(&new_map);
+ if (IS_ERR(extent)) {
+ ret = PTR_ERR(extent);
+ goto out;
+ }
/* Find the end of line and ensure I don't look past it */
next_line = strchr(pos, '\n');
@@ -754,11 +979,11 @@ static ssize_t map_write(struct file *file, const char __user *buf,
new_map.nr_extents++;
/* Fail if the file contains too many extents */
- if ((new_map.nr_extents == UID_GID_MAP_MAX_EXTENTS) &&
+ if ((new_map.nr_extents == UID_GID_MAP_MAX) &&
(next_line != NULL))
goto out;
}
- /* Be very certaint the new map actually exists */
+ /* Be very certain the new map actually exists */
if (new_map.nr_extents == 0)
goto out;
@@ -772,7 +997,7 @@ static ssize_t map_write(struct file *file, const char __user *buf,
*/
for (idx = 0; idx < new_map.nr_extents; idx++) {
u32 lower_first;
- extent = &new_map.extent[idx];
+ extent = get_idmap(&new_map, idx);
lower_first = map_id_range_down(parent_map,
extent->lower_first,
@@ -788,15 +1013,20 @@ static ssize_t map_write(struct file *file, const char __user *buf,
}
/* Install the map */
- memcpy(map->extent, new_map.extent,
- new_map.nr_extents*sizeof(new_map.extent[0]));
+ memcpy(map->extent, new_map.extent, sizeof(new_map.extent));
+ map->direct = new_map.direct;
+ map->idirect = new_map.idirect;
+ map->didirect = new_map.didirect;
smp_wmb();
map->nr_extents = new_map.nr_extents;
*ppos = count;
ret = count;
out:
+ if (ret < 0)
+ free_extents(&new_map);
mutex_unlock(&userns_state_mutex);
+
kfree(kbuf);
return ret;
}
--
2.14.1
Powered by blists - more mailing lists