diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-13 14:59:03 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-03 16:23:19 -0500 |
| commit | 99214a2ff7f6faef389659e93dafdf41ae86a72b (patch) | |
| tree | 13a2fa6428b26a3ca22ae69e01a1fb84a747fe2b /crypto | |
| parent | e1ed9a4b4380fc33c558a0c1bd7cbf527e891151 (diff) | |
| download | lwn-99214a2ff7f6faef389659e93dafdf41ae86a72b.tar.gz lwn-99214a2ff7f6faef389659e93dafdf41ae86a72b.zip | |
crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path
[ Upstream commit 6a935170a980024dd29199e9dbb5c4da4767a1b9 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'crypto')
| -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 fef296cc9124..63acec501aaa 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); @@ -265,8 +271,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; @@ -299,6 +305,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; |