Commit 88dd6606 authored by Herbert Xu's avatar Herbert Xu Committed by Luis Henriques

crypto: af_alg - Forbid bind(2) when nokey child sockets are present

commit a6a48c56 upstream.

This patch forbids the calling of bind(2) when there are child
sockets created by accept(2) in existence, even if they are created
on the nokey path.

This is needed as those child sockets have references to the tfm
object which bind(2) will destroy.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 1446bff2
...@@ -130,19 +130,16 @@ EXPORT_SYMBOL_GPL(af_alg_release); ...@@ -130,19 +130,16 @@ EXPORT_SYMBOL_GPL(af_alg_release);
void af_alg_release_parent(struct sock *sk) void af_alg_release_parent(struct sock *sk)
{ {
struct alg_sock *ask = alg_sk(sk); struct alg_sock *ask = alg_sk(sk);
bool last; unsigned int nokey = ask->nokey_refcnt;
bool last = nokey && !ask->refcnt;
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);
last = !--ask->refcnt; ask->nokey_refcnt -= nokey;
if (!last)
last = !--ask->refcnt;
release_sock(sk); release_sock(sk);
if (last) if (last)
...@@ -185,7 +182,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -185,7 +182,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
err = -EBUSY; err = -EBUSY;
lock_sock(sk); lock_sock(sk);
if (ask->refcnt) if (ask->refcnt | ask->nokey_refcnt)
goto unlock; goto unlock;
swap(ask->type, type); swap(ask->type, type);
...@@ -296,6 +293,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) ...@@ -296,6 +293,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)
if (nokey || !ask->refcnt++) if (nokey || !ask->refcnt++)
sock_hold(sk); sock_hold(sk);
ask->nokey_refcnt += nokey;
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; alg_sk(sk2)->nokey_refcnt = nokey;
......
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