Commit 3939cbba authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Thadeu Lima de Souza Cascardo

f2fs crypto: add missing locking for keyring_key access

BugLink: http://bugs.launchpad.net/bugs/1729107

commit 745e8490 upstream.

This patch adopts:
	ext4 crypto: add missing locking for keyring_key access
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dfb3e884
......@@ -193,9 +193,11 @@ int f2fs_get_encryption_info(struct inode *inode)
res = -ENOKEY;
goto out;
}
down_read(&keyring_key->sem);
ukp = user_key_payload(keyring_key);
if (ukp->datalen != sizeof(struct f2fs_encryption_key)) {
res = -EINVAL;
up_read(&keyring_key->sem);
goto out;
}
master_key = (struct f2fs_encryption_key *)ukp->data;
......@@ -206,10 +208,12 @@ int f2fs_get_encryption_info(struct inode *inode)
"f2fs: key size incorrect: %d\n",
master_key->size);
res = -ENOKEY;
up_read(&keyring_key->sem);
goto out;
}
res = f2fs_derive_key_aes(ctx.nonce, master_key->raw,
raw_key);
up_read(&keyring_key->sem);
if (res)
goto out;
......
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