diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-02-05 19:38:42 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-27 10:23:18 +0200 |
| commit | 7d9e13d953f2a3029d8b26a6f9a7dae83a4594ae (patch) | |
| tree | a793be5eb2f00dafdbb612043743b6a389cbe205 /fs/f2fs | |
| parent | 4db9f1113196e7b4df4e754e7e770b22aee81c01 (diff) | |
f2fs crypto: add missing locking for keyring_key access
commit 745e8490b1e960ad79859dd8ba6a0b5a8d3d994e upstream.
This patch adopts:
ext4 crypto: add missing locking for keyring_key access
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/crypto_key.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/f2fs/crypto_key.c b/fs/f2fs/crypto_key.c index 81c87f7a3251..ae49be377b60 100644 --- a/fs/f2fs/crypto_key.c +++ b/fs/f2fs/crypto_key.c @@ -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; |