diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-04 13:35:18 +0900 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-03 16:23:18 -0500 |
| commit | 92d76b5b2c3a29e14bc01a5e96d075afd4c6644f (patch) | |
| tree | da1cf0b8d9b7144977770b0c36fc155df0f7421e /crypto | |
| parent | fa988b35c2e40f38e57388a1a3f48de056e81dd3 (diff) | |
crypto: af_alg - Add nokey compatibility path
[ Upstream commit 37766586c965d63758ad542325a96d5384f4a8c9 ]
This patch adds a compatibility path to support old applications
that do acept(2) before setkey.
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/af_alg.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 153dc85e04f1..fef296cc9124 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -76,6 +76,8 @@ int af_alg_register_type(const struct af_alg_type *type) goto unlock; type->ops->owner = THIS_MODULE; + if (type->ops_nokey) + type->ops_nokey->owner = THIS_MODULE; node->type = type; list_add(&node->list, &alg_types); err = 0; @@ -264,6 +266,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) const struct af_alg_type *type; struct sock *sk2; int err; + bool nokey; lock_sock(sk); type = ask->type; @@ -282,12 +285,17 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) security_sk_clone(sk, sk2); err = type->accept(ask->private, sk2); + + nokey = err == -ENOKEY; + if (nokey && type->accept_nokey) + err = type->accept_nokey(ask->private, sk2); + if (err) goto unlock; sk2->sk_family = PF_ALG; - if (!ask->refcnt++) + if (nokey || !ask->refcnt++) sock_hold(sk); alg_sk(sk2)->parent = sk; alg_sk(sk2)->type = type; @@ -295,6 +303,9 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) newsock->ops = type->ops; newsock->state = SS_CONNECTED; + if (nokey) + newsock->ops = type->ops_nokey; + err = 0; unlock: |