Skip to content

Commit 35fc59c

Browse files
zenczykowskidavem330
authored andcommitted
net-ipv6: IPV6_TRANSPARENT - check NET_RAW prior to NET_ADMIN
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 723eb53 commit 35fc59c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/ipv6/ipv6_sockglue.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
363363
break;
364364

365365
case IPV6_TRANSPARENT:
366-
if (valbool && !ns_capable(net->user_ns, CAP_NET_ADMIN) &&
367-
!ns_capable(net->user_ns, CAP_NET_RAW)) {
366+
if (valbool && !ns_capable(net->user_ns, CAP_NET_RAW) &&
367+
!ns_capable(net->user_ns, CAP_NET_ADMIN)) {
368368
retv = -EPERM;
369369
break;
370370
}

0 commit comments

Comments
 (0)