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

Commit 2433c8f0 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

net: Update the sysctl permissions handler to test effective uid/gid 



Modify the code to use current_euid(), and in_egroup_p, as in done
in fs/proc/proc_sysctl.c:test_perm()

Cc: stable@vger.kernel.org
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reported-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 13caa8ed

net/sysctl_net.c

+2 −2
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ static int net_ctl_permissions(struct ctl_table_header *head, 


	/* Allow network administrator to have same access as root. */

	if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||

	    uid_eq(root_uid, current_uid())) {

	    uid_eq(root_uid, current_euid())) {

		int mode = (table->mode >> 6) & 7;

		return (mode << 6) | (mode << 3) | mode;

	}

	/* Allow netns root group to have the same access as the root group */

	if (gid_eq(root_gid, current_gid())) {

	if (in_egroup_p(root_gid)) {

		int mode = (table->mode >> 3) & 7;

		return (mode << 3) | mode;

	}