net-ipv6: IPV6_TRANSPARENT - check NET_RAW prior to NET_ADMIN
Subsystems (3)
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.
Signed-off-by Maciej Żenczykowski <[email protected]>
--- net/ipv6/ipv6_sockglue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ipv6_sockglue.c +2 -2
@@ -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
From: Maciej Żenczykowski <[email protected]>
Date: Thu, 21 Nov 2019 13:19:08 -0800
Quoted 8 lines
From: Maciej Żenczykowski <[email protected]>
NET_RAWis less dangerous, so more likely to be available to a process, so check it first to prevent some spurious logging.This matches
IP_TRANSPARENTwhich checksNET_RAWfirst.Signed-off-by Maciej Żenczykowski <[email protected]>
Applied, thanks.