iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path

Browse Source 
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>
This commit is contained in:
Herbert Xu 2016-01-13 14:59:03 +08:00
parent 70401f4edc
commit 6a935170a9
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/af_alg.c
View File

@ -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)
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)
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;

1
include/crypto/if_alg.h
View File

@ -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;