summaryrefslogtreecommitdiff
path: root/kernel/user_namespace.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2017-10-31 17:09:34 -0500
committerEric W. Biederman <ebiederm@xmission.com>2017-10-31 17:23:12 -0500
commitd5e7b3c5f51fc6d34e12b6d87bfd30ab277c4625 (patch)
treea72ab0e9c38b7fb30d02e32dcb6785f1ab122a00 /kernel/user_namespace.c
parent3edf652fa16562fb57a5a4b996ba72e2d7cdc38b (diff)
userns: Don't read extents twice in m_start
This is important so reading /proc/<pid>/{uid_map,gid_map,projid_map} while the map is being written does not do strange things. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/user_namespace.c')
-rw-r--r--kernel/user_namespace.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 563a2981d7c7..4f7e357ac1e2 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -683,11 +683,13 @@ static void *m_start(struct seq_file *seq, loff_t *ppos,
struct uid_gid_map *map)
{
loff_t pos = *ppos;
+ unsigned extents = map->nr_extents;
+ smp_rmb();
- if (pos >= map->nr_extents)
+ if (pos >= extents)
return NULL;
- if (map->nr_extents <= UID_GID_MAP_MAX_BASE_EXTENTS)
+ if (extents <= UID_GID_MAP_MAX_BASE_EXTENTS)
return &map->extent[pos];
return &map->forward[pos];