diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-09 03:06:01 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-09 03:06:01 +0400 |
| commit | 92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98 (patch) | |
| tree | 74a41755d00b908b6e6e31a69ba77774558bf26f /net/ipv6/ipv6_sockglue.c | |
| parent | 03c6b749b364fe7b8e47ed8e1ce26baca167c322 (diff) | |
| parent | ca9334523c853e407da7b3a0bd02f54d0fa59414 (diff) | |
| download | linux-92e52b2e82bec10a70744d4a2b04e0ff2dfe2c98.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index f3ef4c38d315..3bc144a79fa5 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -504,6 +504,9 @@ done: break; case IPV6_IPSEC_POLICY: case IPV6_XFRM_POLICY: + retv = -EPERM; + if (!capable(CAP_NET_ADMIN)) + break; retv = xfrm_user_policy(sk, optname, optval, optlen); break; |