aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorMister Oyster <oysterized@gmail.com>2018-01-05 03:21:13 +0100
committerMister Oyster <oysterized@gmail.com>2018-01-05 03:30:24 +0100
commitdc2da0365d12f882caa3afe0aea02f7fbbddcd69 (patch)
treea72665231996f7f342241bd552f0d350d16729a1 /crypto
parent654c97a393fb9e9cb6d52143da9343941907e17e (diff)
Revert "crypto: af_alg - Forbid the use internal algorithms"
This reverts commit 2d5e3c9f473699ac70806800018e1fbc996121ad.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/af_alg.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 5a790f446..dc3ddef69 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -155,7 +155,6 @@ EXPORT_SYMBOL_GPL(af_alg_release_parent);
static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
{
- const u32 forbidden = CRYPTO_ALG_INTERNAL;
struct sock *sk = sock->sk;
struct alg_sock *ask = alg_sk(sk);
struct sockaddr_alg *sa = (void *)uaddr;
@@ -181,9 +180,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
if (IS_ERR(type))
return PTR_ERR(type);
- private = type->bind(sa->salg_name,
- sa->salg_feat & ~forbidden,
- sa->salg_mask & ~forbidden);
+ private = type->bind(sa->salg_name, sa->salg_feat, sa->salg_mask);
if (IS_ERR(private)) {
module_put(type->owner);
return PTR_ERR(private);