diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:19:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:19:52 +0100 |
| commit | d01bd6fdb3be2f6cec1d5918e20175adca97615b (patch) | |
| tree | 7d5196a198ccb77b43dfbfea8f2492966b3adf76 /crypto | |
| parent | f056113faf553e166cb54bd6d1fe4f4b82c27568 (diff) | |
| parent | 5e9a2a3622d30c36814ea4df359c83dde1bf53a5 (diff) | |
Merge tag 'v3.10.46' into linux-linaro-lsk
This is the 3.10.46 stable release
Diffstat (limited to 'crypto')
| -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) type -= CRYPTO_MSG_BASE; link = &crypto_dispatch[type]; - if (!capable(CAP_NET_ADMIN)) + if (!netlink_capable(skb, CAP_NET_ADMIN)) return -EPERM; if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) && |