Messages in this thread Patch in this message | | | From | Giuseppe Scrivano <> | Subject | [PATCH] kernel: automatically split user namespace extent | Date | Thu, 26 Nov 2020 11:08:39 +0100 |
| |
writing to the id map fails when an extent overlaps multiple mappings in the parent user namespace, e.g.:
$ cat /proc/self/uid_map 0 1000 1 1 100000 65536 $ unshare -U sleep 100 & [1] 1029703 $ printf "0 0 100\n" | tee /proc/$!/uid_map 0 0 100 tee: /proc/1029703/uid_map: Operation not permitted
To prevent it from happening, automatically split an extent so that each portion fits in one extent in the parent user namespace.
$ cat /proc/self/uid_map 0 1000 1 1 110000 65536 $ unshare -U sleep 100 & [1] 1552 $ printf "0 0 100\n" | tee /proc/$!/uid_map 0 0 100 $ cat /proc/$!/uid_map 0 0 1 1 1 99
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> --- kernel/user_namespace.c | 62 ++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 10 deletions(-)
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 87804e0371fe..b5542be2bd0a 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -706,6 +706,41 @@ const struct seq_operations proc_projid_seq_operations = { .show = projid_m_show, }; +static void split_overlapping_mappings(struct uid_gid_map *parent_map, + struct uid_gid_extent *extent, + struct uid_gid_extent *overflow_extent) +{ + unsigned int idx; + + overflow_extent->first = (u32) -1; + + /* Split extent if it not fully contained in an extent from parent_map. */ + for (idx = 0; idx < parent_map->nr_extents; idx++) { + struct uid_gid_extent *prev; + u32 first, last, prev_last, size; + + if (parent_map->nr_extents <= UID_GID_MAP_MAX_BASE_EXTENTS) + prev = &parent_map->extent[idx]; + else + prev = &parent_map->forward[idx]; + + first = extent->lower_first; + last = extent->lower_first + extent->count - 1; + prev_last = prev->first + prev->count - 1; + + if ((first <= prev_last) && (last > prev_last)) { + size = prev_last - first + 1; + + overflow_extent->first = extent->first + size; + overflow_extent->lower_first = extent->lower_first + size; + overflow_extent->count = extent->count - size; + + extent->count = size; + return; + } + } +} + static bool mappings_overlap(struct uid_gid_map *new_map, struct uid_gid_extent *extent) { @@ -852,6 +887,7 @@ static ssize_t map_write(struct file *file, const char __user *buf, struct uid_gid_map new_map; unsigned idx; struct uid_gid_extent extent; + struct uid_gid_extent overflow_extent; char *kbuf = NULL, *pos, *next_line; ssize_t ret; @@ -946,18 +982,24 @@ static ssize_t map_write(struct file *file, const char __user *buf, extent.lower_first) goto out; - /* Do the ranges in extent overlap any previous extents? */ - if (mappings_overlap(&new_map, &extent)) - goto out; + do { + /* Do the ranges in extent overlap any previous extents? */ + if (mappings_overlap(&new_map, &extent)) + goto out; - if ((new_map.nr_extents + 1) == UID_GID_MAP_MAX_EXTENTS && - (next_line != NULL)) - goto out; + if ((new_map.nr_extents + 1) == UID_GID_MAP_MAX_EXTENTS && + (next_line != NULL)) + goto out; - ret = insert_extent(&new_map, &extent); - if (ret < 0) - goto out; - ret = -EINVAL; + split_overlapping_mappings(parent_map, &extent, &overflow_extent); + + ret = insert_extent(&new_map, &extent); + if (ret < 0) + goto out; + ret = -EINVAL; + + extent = overflow_extent; + } while (overflow_extent.first != (u32) -1); } /* Be very certaint the new map actually exists */ if (new_map.nr_extents == 0) -- 2.28.0
| |