From fc3bd71d5796bef30162f183cc7c2fd3d442afb5 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 31 Dec 2015 17:24:40 -0500 Subject: ext4 crypto: add missing locking for keyring_key access Cc: stable@kernel.org Signed-off-by: Theodore Ts'o Signed-off-by: "Theodore Ts'o" Change-Id: Ia13629b6512a0c5dd2a09e7e3676c74af20c96a3 --- fs/ext4/crypto_key.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c index 20f295967..84dccd223 100644 --- a/fs/ext4/crypto_key.c +++ b/fs/ext4/crypto_key.c @@ -213,9 +213,11 @@ retry: res = -ENOKEY; goto out; } + down_read(&keyring_key->sem); ukp = ((struct user_key_payload *)keyring_key->payload.data); if (ukp->datalen != sizeof(struct ext4_encryption_key)) { res = -EINVAL; + up_read(&keyring_key->sem); goto out; } master_key = (struct ext4_encryption_key *)ukp->data; @@ -226,10 +228,12 @@ retry: "ext4: key size incorrect: %d\n", master_key->size); res = -ENOKEY; + up_read(&keyring_key->sem); goto out; } res = ext4_derive_key_aes(ctx.nonce, master_key->raw, raw_key); + up_read(&keyring_key->sem); if (res) goto out; got_key: -- cgit v1.2.3