Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[karo-tx-linux.git] / net / ipv6 / ipv6_sockglue.c

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 2fbda5fc4cc48ffd5a1286b3a26f887148f9af38..c99e3ee9781f246f82185e8a0e246e02a258cf82 100644 (file)
--- 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,
                break;
 
        case IPV6_TRANSPARENT:
-               if (!capable(CAP_NET_ADMIN)) {
+               if (valbool && !capable(CAP_NET_ADMIN) && !capable(CAP_NET_RAW)) {
                        retv = -EPERM;
                        break;
                }