diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-14 03:02:50 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-15 23:59:28 +0200 |
| commit | 091bd3ea4e7ff4da8509978b9be93dc9d8cf0680 (patch) | |
| tree | 0f7eb15899232f24bd1432c5893f96c9ade788bc /fs/proc/proc_sysctl.c | |
| parent | userns: Convert proc to use kuid/kgid where appropriate (diff) | |
| download | linux-091bd3ea4e7ff4da8509978b9be93dc9d8cf0680.tar.xz linux-091bd3ea4e7ff4da8509978b9be93dc9d8cf0680.zip | |
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>
Diffstat (limited to 'fs/proc/proc_sysctl.c')
| -rw-r--r-- | fs/proc/proc_sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 21d836f40292..3476bca8f7af 100644 --- 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; |