Commit 6a935170 authored by Herbert Xu's avatar Herbert Xu

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 70401f4e
...@@ -133,6 +133,12 @@ void af_alg_release_parent(struct sock *sk) ...@@ -133,6 +133,12 @@ void af_alg_release_parent(struct sock *sk)
bool last; bool last;
sk = ask->parent; sk = ask->parent;
if (ask->nokey_refcnt && !ask->refcnt) {
sock_put(sk);
return;
}
ask = alg_sk(sk); ask = alg_sk(sk);
lock_sock(sk); lock_sock(sk);
...@@ -268,8 +274,8 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) ...@@ -268,8 +274,8 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
struct alg_sock *ask = alg_sk(sk); struct alg_sock *ask = alg_sk(sk);
const struct af_alg_type *type; const struct af_alg_type *type;
struct sock *sk2; struct sock *sk2;
unsigned int nokey;
int err; int err;
bool nokey;
lock_sock(sk); lock_sock(sk);
type = ask->type; type = ask->type;
...@@ -302,6 +308,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) ...@@ -302,6 +308,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
sock_hold(sk); sock_hold(sk);
alg_sk(sk2)->parent = sk; alg_sk(sk2)->parent = sk;
alg_sk(sk2)->type = type; alg_sk(sk2)->type = type;
alg_sk(sk2)->nokey_refcnt = nokey;
newsock->ops = type->ops; newsock->ops = type->ops;
newsock->state = SS_CONNECTED; newsock->state = SS_CONNECTED;
......
...@@ -31,6 +31,7 @@ struct alg_sock { ...@@ -31,6 +31,7 @@ struct alg_sock {
struct sock *parent; struct sock *parent;
unsigned int refcnt; unsigned int refcnt;
unsigned int nokey_refcnt;
const struct af_alg_type *type; const struct af_alg_type *type;
void *private; void *private;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment