lkml.org 
[lkml]   [2017]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
Subject[PATCH 3/5] 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>
---
kernel/user_namespace.c | 6 ++++--
1 file 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];
--
2.14.1
\
 
 \ /
  Last update: 2017-11-01 00:48    [W:0.147 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site