Skip to content

Commit

Permalink
userns: Convert sysctl permission checks to use kuid and kgids.
Browse files Browse the repository at this point in the history
Acked-by: Serge Hallyn <[email protected]>
Signed-off-by: Eric W. Biederman <[email protected]>
  • Loading branch information
ebiederm committed May 15, 2012
1 parent dcb0f22 commit 091bd3e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions fs/proc/proc_sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 091bd3e

Please sign in to comment.