From 0502f85e13bff3c61e7c97e804082e34dbc6e9e4 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Mon, 13 Feb 2012 18:02:50 -0800 Subject: [PATCH] --- yaml --- r: 306017 b: refs/heads/master c: 091bd3ea4e7ff4da8509978b9be93dc9d8cf0680 h: refs/heads/master i: 306015: f00308f52f5ec3cd9b2c93b4b07ec556ba6e6e54 v: v3 --- [refs] | 2 +- trunk/fs/proc/proc_sysctl.c | 4 ++-- trunk/init/Kconfig | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 783da812884f..b0d73cb831f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcb0f22282e680ee5202ab7574ce78beb3803a9f +refs/heads/master: 091bd3ea4e7ff4da8509978b9be93dc9d8cf0680 diff --git a/trunk/fs/proc/proc_sysctl.c b/trunk/fs/proc/proc_sysctl.c index 21d836f40292..3476bca8f7af 100644 --- a/trunk/fs/proc/proc_sysctl.c +++ b/trunk/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/trunk/init/Kconfig b/trunk/init/Kconfig index 7bebe91367c5..be587651b952 100644 --- a/trunk/init/Kconfig +++ b/trunk/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