提交 091bd3ea 编写于 作者: E Eric W. Biederman

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

Acked-by: NSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
上级 dcb0f222
...@@ -371,9 +371,9 @@ void register_sysctl_root(struct ctl_table_root *root) ...@@ -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;
......
...@@ -948,7 +948,6 @@ config UIDGID_CONVERTED ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册