diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-13 14:59:03 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-18 18:16:32 +0800 |
| commit | 6a935170a980024dd29199e9dbb5c4da4767a1b9 (patch) | |
| tree | 367c9181e955fc1d2bd242defe62593705575c8e /crypto/af_alg.c | |
| parent | 70401f4edc331c3c8068fc13b93d784a72de053e (diff) | |
| download | op-kernel-dev-6a935170a980024dd29199e9dbb5c4da4767a1b9.zip op-kernel-dev-6a935170a980024dd29199e9dbb5c4da4767a1b9.tar.gz | |
crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path
This patch allows af_alg_release_parent to be called even for
nokey sockets.
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/af_alg.c')
| -rw-r--r-- | crypto/af_alg.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 6566d2e..e7cb836 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -133,6 +133,12 @@ void af_alg_release_parent(struct sock *sk) bool last; sk = ask->parent; + + if (ask->nokey_refcnt && !ask->refcnt) { + sock_put(sk); + return; + } + ask = alg_sk(sk); lock_sock(sk); @@ -268,8 +274,8 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) struct alg_sock *ask = alg_sk(sk); const struct af_alg_type *type; struct sock *sk2; + unsigned int nokey; int err; - bool nokey; lock_sock(sk); type = ask->type; @@ -302,6 +308,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) sock_hold(sk); alg_sk(sk2)->parent = sk; alg_sk(sk2)->type = type; + alg_sk(sk2)->nokey_refcnt = nokey; newsock->ops = type->ops; newsock->state = SS_CONNECTED; |
