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>

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 21d836f40292dba85a47b61aed4b0b30028ec41f..3476bca8f7af93392539e28b14aeaf9b40c457a0 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -371,9 +371,9 @@ void register_sysctl_root(struct ctl_table_root *root)
 
 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;

diff --git a/init/Kconfig b/init/Kconfig
index 7bebe91367c51e19cadcaab28544301a1f7d6f53..be587651b952df6de02641dd10857ae42c39d1b7 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -948,7 +948,6 @@ config UIDGID_CONVERTED
        depends on NTFS_FS = n
        depends on OCFS2_FS = n
        depends on OMFS_FS = n
-       depends on PROC_SYSCTL = n
        depends on QNX4FS_FS = n
        depends on QNX6FS_FS = n
        depends on REISERFS_FS = n