diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
| commit | cd04b947bc674f8fc9cac38ec30497bae5d664ad (patch) | |
| tree | 988b0b7ea08063e5499672346eb2f619f0629717 /net/ipv4/ip_sockglue.c | |
| parent | b3df9f813bc7b9db62ae0c90b8990b1cebf97345 (diff) | |
| parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index fc7c481d0d79..ff4bd067b397 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
| @@ -848,6 +848,9 @@ mc_msf_out: | |||
| 848 | 848 | ||
| 849 | case IP_IPSEC_POLICY: | 849 | case IP_IPSEC_POLICY: |
| 850 | case IP_XFRM_POLICY: | 850 | case IP_XFRM_POLICY: |
| 851 | err = -EPERM; | ||
| 852 | if (!capable(CAP_NET_ADMIN)) | ||
| 853 | break; | ||
| 851 | err = xfrm_user_policy(sk, optname, optval, optlen); | 854 | err = xfrm_user_policy(sk, optname, optval, optlen); |
| 852 | break; | 855 | break; |
| 853 | 856 | ||