diff options
author | Maciej Żenczykowski <maze@google.com> | 2011-10-20 18:21:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-20 18:21:36 -0400 |
commit | 6cc7a765c2987f03ba278dac03c7cc759ee198e7 (patch) | |
tree | 1afd1f5b4da65279b84aa5b74f9c69e8ad3f3b36 /net/ipv6 | |
parent | 05bdd2f14351176d368e8ddc67993690a2d1bfb6 (diff) |
net: allow CAP_NET_RAW to set socket options IP{,V6}_TRANSPARENT
Up till now the IP{,V6}_TRANSPARENT socket options (which actually set
the same bit in the socket struct) have required CAP_NET_ADMIN
privileges to set or clear the option.
- we make clearing the bit not require any privileges.
- we allow CAP_NET_ADMIN to set the bit (as before this change)
- we allow CAP_NET_RAW to set this bit, because raw
sockets already pretty much effectively allow you
to emulate socket transparency.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ipv6_sockglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 2fbda5fc4cc4..c99e3ee9781f 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c | |||
@@ -343,7 +343,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, | |||
343 | break; | 343 | break; |
344 | 344 | ||
345 | case IPV6_TRANSPARENT: | 345 | case IPV6_TRANSPARENT: |
346 | if (!capable(CAP_NET_ADMIN)) { | 346 | if (valbool && !capable(CAP_NET_ADMIN) && !capable(CAP_NET_RAW)) { |
347 | retv = -EPERM; | 347 | retv = -EPERM; |
348 | break; | 348 | break; |
349 | } | 349 | } |