evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2012-02-13 18:02:50 -08:00
parent dcb0f22282
commit 091bd3ea4e
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/proc/proc_sysctl.c
View file

@ -371,9 +371,9 @@ void register_sysctl_root(struct ctl_table_root *root)
static int test_perm(int mode, int op) static int test_perm(int mode, int op)
{ {
if (!current_euid()) if (uid_eq(current_euid(), GLOBAL_ROOT_UID))
mode >>= 6; mode >>= 6;
else if (in_egroup_p(0)) else if (in_egroup_p(GLOBAL_ROOT_GID))
mode >>= 3; mode >>= 3;
if ((op & ~mode & (MAY_READ|MAY_WRITE|MAY_EXEC)) == 0) if ((op & ~mode & (MAY_READ|MAY_WRITE|MAY_EXEC)) == 0)
return 0; return 0;

1
init/Kconfig
View file

@ -948,7 +948,6 @@ config UIDGID_CONVERTED
depends on NTFS_FS = n depends on NTFS_FS = n
depends on OCFS2_FS = n depends on OCFS2_FS = n
depends on OMFS_FS = n depends on OMFS_FS = n
depends on PROC_SYSCTL = n
depends on QNX4FS_FS = n depends on QNX4FS_FS = n
depends on QNX6FS_FS = n depends on QNX6FS_FS = n
depends on REISERFS_FS = n depends on REISERFS_FS = n