diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-15 15:01:08 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-18 11:16:34 +0100 |
| commit | ad46d7e33219218605ea619e32553daf4f346b9f (patch) | |
| tree | 41d1566160c2dc875fab29865a8988e0fae4d05b /crypto/algif_hash.c | |
| parent | crypto: CRYPTO_DEV_ATMEL_AES should depend on HAS_DMA (diff) | |
| download | linux-ad46d7e33219218605ea619e32553daf4f346b9f.tar.xz linux-ad46d7e33219218605ea619e32553daf4f346b9f.zip | |
crypto: algif_hash - Fix race condition in hash_check_key
We need to lock the child socket in hash_check_key as otherwise
two simultaneous calls can cause the parent socket to be freed.
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/algif_hash.c')
| -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 3653ab60ec79..608a7562839d 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -242,22 +242,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; @@ -271,6 +272,8 @@ static int hash_check_key(struct socket *sock) unlock: release_sock(psk); +unlock_child: + release_sock(sk); return err; } |