diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-15 22:01:08 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-02-24 14:40:37 +0000 |
| commit | f47ff3820bf21d8f6d15aabb9c287025578a2521 (patch) | |
| tree | c1f7720f9b956017bb6a93c0045148f925318d8b /crypto | |
| parent | 2643fc0d9d22061faae513130f45fb5b0d9478e3 (diff) | |
| download | linux-stable-f47ff3820bf21d8f6d15aabb9c287025578a2521.tar.gz linux-stable-f47ff3820bf21d8f6d15aabb9c287025578a2521.tar.bz2 linux-stable-f47ff3820bf21d8f6d15aabb9c287025578a2521.zip | |
crypto: algif_hash - Fix race condition in hash_check_key
commit ad46d7e33219218605ea619e32553daf4f346b9f upstream.
We need to lock the child socket in hash_check_key as otherwise
two simultaneous calls can cause the parent socket to be freed.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_hash.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 287e3fe08428..2dfb0f10e0bb 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -253,22 +253,23 @@ static struct proto_ops algif_hash_ops = { static int hash_check_key(struct socket *sock) { - int err; + int err = 0; struct sock *psk; struct alg_sock *pask; struct algif_hash_tfm *tfm; struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); + lock_sock(sk); if (ask->refcnt) - return 0; + goto unlock_child; psk = ask->parent; pask = alg_sk(ask->parent); tfm = pask->private; err = -ENOKEY; - lock_sock(psk); + lock_sock_nested(psk, SINGLE_DEPTH_NESTING); if (!tfm->has_key) goto unlock; @@ -282,6 +283,8 @@ static int hash_check_key(struct socket *sock) unlock: release_sock(psk); +unlock_child: + release_sock(sk); return err; } |