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 /crypto/crypto_user.c | |
| parent | 057b0a7518e4b8fca26201715996d6d928a62300 (diff) | |
| parent | 4cf563c5d97c83d4b2fb3a778dd7d5e362cc3e34 (diff) | |
Merge branch 'acpi-pm' into pm-sleep
Diffstat (limited to 'crypto/crypto_user.c')
| -rw-r--r-- | crypto/crypto_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c index 1512e41cd93d..43665d0d0905 100644 --- a/crypto/crypto_user.c +++ b/crypto/crypto_user.c | |||
| @@ -466,7 +466,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 466 | type -= CRYPTO_MSG_BASE; | 466 | type -= CRYPTO_MSG_BASE; |
| 467 | link = &crypto_dispatch[type]; | 467 | link = &crypto_dispatch[type]; |
| 468 | 468 | ||
| 469 | if (!capable(CAP_NET_ADMIN)) | 469 | if (!netlink_capable(skb, CAP_NET_ADMIN)) |
| 470 | return -EPERM; | 470 | return -EPERM; |
| 471 | 471 | ||
| 472 | if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) && | 472 | if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) && |