diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-06 18:17:50 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-06 18:17:50 -0400 |
| commit | 3eba148d75670f61463dd3c9ef8672da8f290f36 (patch) | |
| tree | 45cb8fbda6d6ce9d73aeeac673282e37b0be2531 /net/xfrm/xfrm_user.c | |
| parent | 057b0a7518e4b8fca26201715996d6d928a62300 (diff) | |
| parent | 4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34 (diff) | |
Merge branch 'acpi-pm' into pm-sleep
Diffstat (limited to 'net/xfrm/xfrm_user.c')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 8f131c10a6f3..51398ae6cda8 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
| @@ -2377,7 +2377,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 2377 | link = &xfrm_dispatch[type]; | 2377 | link = &xfrm_dispatch[type]; |
| 2378 | 2378 | ||
| 2379 | /* All operations require privileges, even GET */ | 2379 | /* All operations require privileges, even GET */ |
| 2380 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) | 2380 | if (!netlink_net_capable(skb, CAP_NET_ADMIN)) |
| 2381 | return -EPERM; | 2381 | return -EPERM; |
| 2382 | 2382 | ||
| 2383 | if ((type == (XFRM_MSG_GETSA - XFRM_MSG_BASE) || | 2383 | if ((type == (XFRM_MSG_GETSA - XFRM_MSG_BASE) || |