diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-09 16:20:49 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-09 16:20:49 -0500 |
| commit | 471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch) | |
| tree | ac026ba976bc253fc87a5cdec8f33d24d03e1c9c /net/ipv4/ip_sockglue.c | |
| parent | 20e007b8cc1266ff78810457d6e26c35c6b810ba (diff) | |
| parent | db29e85a7ece62de1899917c1ec0ffe55cf1d3a0 (diff) | |
| download | op-kernel-dev-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.zip op-kernel-dev-471417c9cfb4c2574e2c03bf2273fe12f5388a8e.tar.gz | |
Merge ../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 fc7c481..ff4bd06 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -848,6 +848,9 @@ mc_msf_out: case IP_IPSEC_POLICY: case IP_XFRM_POLICY: + err = -EPERM; + if (!capable(CAP_NET_ADMIN)) + break; err = xfrm_user_policy(sk, optname, optval, optlen); break; |
