Commit acbf720a authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman

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

commit 2433c8f0 upstream.

Modify the code to use current_euid(), and in_egroup_p, as in done
in fs/proc/proc_sysctl.c:test_perm()
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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0348152
...@@ -47,12 +47,12 @@ static int net_ctl_permissions(struct ctl_table_header *head, ...@@ -47,12 +47,12 @@ static int net_ctl_permissions(struct ctl_table_header *head,
/* Allow network administrator to have same access as root. */ /* Allow network administrator to have same access as root. */
if (ns_capable(net->user_ns, CAP_NET_ADMIN) || 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; int mode = (table->mode >> 6) & 7;
return (mode << 6) | (mode << 3) | mode; return (mode << 6) | (mode << 3) | mode;
} }
/* Allow netns root group to have the same access as the root group */ /* 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; int mode = (table->mode >> 3) & 7;
return (mode << 3) | mode; return (mode << 3) | mode;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment