Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 091bd3ea authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

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



Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent dcb0f222

fs/proc/proc_sysctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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