diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-15 22:01:08 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-03 16:23:19 -0500 |
| commit | 3a1e81ad84e4d880b00ecf7ad8d03b9b772ddfa7 (patch) | |
| tree | c4d08914bca51ca9be9f0a3e950125cf7401cad5 /crypto | |
| parent | 8515819fff8fce56be067af985016b6356d1fe5e (diff) | |
crypto: algif_hash - Fix race condition in hash_check_key
[ Upstream commit ad46d7e33219218605ea619e32553daf4f346b9f ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.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 1867020987cf..7b5018b34c97 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -234,22 +234,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; @@ -263,6 +264,8 @@ static int hash_check_key(struct socket *sock) unlock: release_sock(psk); +unlock_child: + release_sock(sk); return err; } |