diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-27 17:29:42 +0300 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:34:36 +0200 |
| commit | cab875d3686181dd296aaf1701598beb1d807d00 (patch) | |
| tree | d1e430599af6c5bef95e3da6bd0f7fd7768f678c | |
| parent | 6757f77fb9d65f15a4e7a58d899fecc0950e9a4b (diff) | |
crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path
commit 6a935170a980024dd29199e9dbb5c4da4767a1b9 upstream.
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: Andrey Ryabinin <aryabinin@virtuozzo.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | crypto/af_alg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 68ec1ac41..dc3ddef69 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -134,6 +134,12 @@ void af_alg_release_parent(struct sock *sk) bool last = nokey && !ask->refcnt; sk = ask->parent; + + if (ask->nokey_refcnt && !ask->refcnt) { + sock_put(sk); + return; + } + ask = alg_sk(sk); lock_sock(sk); |