commit 091bd3ea4e7ff4da8509978b9be93dc9d8cf0680
author Eric W. Biederman <ebiederm@xmission.com> Mon Feb 13 18:02:50 2012 -0800
committer Eric W. Biederman <ebiederm@xmission.com> Tue May 15 14:59:28 2012 -0700
tree 0f7eb15899232f24bd1432c5893f96c9ade788bc
parent dcb0f22282e680ee5202ab7574ce78beb3803a9f

userns: Convert sysctl permission checks to use kuid and kgids.

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

fs/proc/proc_sysctl.c

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 21d836f..3476bca 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -371,9 +371,9 @@
 
 static int test_perm(int mode, int op)
 {
-	if (!current_euid())
+	if (uid_eq(current_euid(), GLOBAL_ROOT_UID))
 		mode >>= 6;
-	else if (in_egroup_p(0))
+	else if (in_egroup_p(GLOBAL_ROOT_GID))
 		mode >>= 3;
 	if ((op & ~mode & (MAY_READ|MAY_WRITE|MAY_EXEC)) == 0)
 		return 0;