Skip to contentSkip to conversation

net-ipv6: IPV6_TRANSPARENT - check NET_RAW prior to NET_ADMIN

PATCH Applied Maciej Żenczykowski 2 participants 2 messages Nov 21, 2019 – Nov 22, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net-ipv6: IPV6_TRANSPARENT - check NET_RAW prior to NET_ADMIN

From: Maciej Żenczykowski <[email protected]>

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.

---
 net/ipv6/ipv6_sockglue.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ipv6_sockglue.c +2 -2
index 264c292e7dcc..79fc012dd2ca 100644
@@ -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;
 		}
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog