From f41d4b6659b35615ada327489c8f3a9e560c2749 Mon Sep 17 00:00:00 2001
From: Balazs Scheidler <bazsi@balabit.hu>
Date: Sat, 23 Oct 2010 04:48:14 +0000
Subject: [PATCH] --- yaml --- r: 218399 b: refs/heads/master c:
 b889416b54c90f59276537debd92cb4e84b5f550 h: refs/heads/master i:   218397:
 f7c92394feb15a698465b46b3211b6358405b664   218395:
 c1c71602bbdb567c6259af0f502a325eec73f934   218391:
 ee6949d06bc65243077effbde1d03e6869b6fad4   218383:
 03c17f8354f2c12a70588118348f093b97b927aa   218367:
 31b73434573625eebdd7febc9a5a7f1793a015be v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv6/ipv6_sockglue.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 70402f96e227..bf2383b62305 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0561cf3dbff1f37c0d374fb1b824ef3a117c85e0
+refs/heads/master: b889416b54c90f59276537debd92cb4e84b5f550
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index 0553867a317f..d1770e061c08 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -343,6 +343,10 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 		break;
 
 	case IPV6_TRANSPARENT:
+		if (!capable(CAP_NET_ADMIN)) {
+			retv = -EPERM;
+			break;
+		}
 		if (optlen < sizeof(int))
 			goto e_inval;
 		/* we don't have a separate transparent bit for IPV6 we use the one in the IPv4 socket */