Commit 06ed1f11 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Kamal Mostafa

ext4 crypto: add missing locking for keyring_key access

commit db7730e3 upstream.
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent d5d7ed70
...@@ -213,9 +213,11 @@ int _ext4_get_encryption_info(struct inode *inode) ...@@ -213,9 +213,11 @@ int _ext4_get_encryption_info(struct inode *inode)
res = -ENOKEY; res = -ENOKEY;
goto out; goto out;
} }
down_read(&keyring_key->sem);
ukp = ((struct user_key_payload *)keyring_key->payload.data); ukp = ((struct user_key_payload *)keyring_key->payload.data);
if (ukp->datalen != sizeof(struct ext4_encryption_key)) { if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
res = -EINVAL; res = -EINVAL;
up_read(&keyring_key->sem);
goto out; goto out;
} }
master_key = (struct ext4_encryption_key *)ukp->data; master_key = (struct ext4_encryption_key *)ukp->data;
...@@ -226,10 +228,12 @@ int _ext4_get_encryption_info(struct inode *inode) ...@@ -226,10 +228,12 @@ int _ext4_get_encryption_info(struct inode *inode)
"ext4: key size incorrect: %d\n", "ext4: key size incorrect: %d\n",
master_key->size); master_key->size);
res = -ENOKEY; res = -ENOKEY;
up_read(&keyring_key->sem);
goto out; goto out;
} }
res = ext4_derive_key_aes(ctx.nonce, master_key->raw, res = ext4_derive_key_aes(ctx.nonce, master_key->raw,
raw_key); raw_key);
up_read(&keyring_key->sem);
if (res) if (res)
goto out; goto out;
got_key: got_key:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment