Message ID | 20191121211908.64187-1-zenczykowski@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | net-ipv6: IPV6_TRANSPARENT - check NET_RAW prior to NET_ADMIN | expand |
From: Maciej Żenczykowski <zenczykowski@gmail.com> Date: Thu, 21 Nov 2019 13:19:08 -0800 > From: Maciej Żenczykowski <maze@google.com> > > NET_RAW is less dangerous, so more likely to be available to a process, > so check it first to prevent some spurious logging. > > This matches IP_TRANSPARENT which checks NET_RAW first. > > Signed-off-by: Maciej Żenczykowski <maze@google.com> Applied, thanks.
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 264c292e7dcc..79fc012dd2ca 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -363,8 +363,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, break; case IPV6_TRANSPARENT: - if (valbool && !ns_capable(net->user_ns, CAP_NET_ADMIN) && - !ns_capable(net->user_ns, CAP_NET_RAW)) { + if (valbool && !ns_capable(net->user_ns, CAP_NET_RAW) && + !ns_capable(net->user_ns, CAP_NET_ADMIN)) { retv = -EPERM; break; }