redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

Backport fix for crypto: algif_skcipher - Fix race condition in skcipher_check_key 

commit 1822793a52 upstream.

We need to lock the child socket in skcipher_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>
wifi-calibration
Herbert Xu 2016-02-26 12:44:11 +01:00 committed by Sasha Levin
parent 7327b23abe
commit 64c4131f16
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/algif_skcipher.c
View File

@ -757,22 +757,23 @@ static struct proto_ops algif_skcipher_ops = {
static int skcipher_check_key(struct socket *sock)
{
int err;
int err = 0;
struct sock *psk;
struct alg_sock *pask;
struct skcipher_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;
@ -786,6 +787,8 @@ static int skcipher_check_key(struct socket *sock)
unlock:
release_sock(psk);
unlock_child:
release_sock(sk);
return err;
}