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-09 22:57:31 -0500 |
| commit | 3db68ebaeceed557ef1a44b967294fac80da5cca (patch) | |
| tree | b173e4cdd67fc71281395369d6c1dc3e56387367 | |
| parent | ac9c75f8457a338d19107768a0d25ee38511ff7f (diff) | |
| download | linux-stable-3db68ebaeceed557ef1a44b967294fac80da5cca.tar.gz linux-stable-3db68ebaeceed557ef1a44b967294fac80da5cca.tar.bz2 linux-stable-3db68ebaeceed557ef1a44b967294fac80da5cca.zip | |
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>
| -rw-r--r-- | crypto/af_alg.c | 13 | ||||
| -rw-r--r-- | include/crypto/if_alg.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 1971f3ccb09a..afe3dad23f08 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; @@ -257,6 +259,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; @@ -275,12 +278,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; @@ -288,6 +296,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: diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index 2f38daaab3d7..9e6a2f38c52f 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -51,8 +51,10 @@ struct af_alg_type { void (*release)(void *private); int (*setkey)(void *private, const u8 *key, unsigned int keylen); int (*accept)(void *private, struct sock *sk); + int (*accept_nokey)(void *private, struct sock *sk); struct proto_ops *ops; + struct proto_ops *ops_nokey; struct module *owner; char name[14]; }; |