diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-02-05 19:38:42 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-02-22 16:07:23 -0800 |
| commit | 745e8490b1e960ad79859dd8ba6a0b5a8d3d994e (patch) | |
| tree | 1d37cb7020f87f29cea5c62565afdfb42bc2fd47 | |
| parent | 1dafa51d45c6332f255faee101d9c47eb56ea7c7 (diff) | |
| download | linux-745e8490b1e960ad79859dd8ba6a0b5a8d3d994e.tar.bz2 | |
f2fs crypto: add missing locking for keyring_key access
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>
| -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 2d491eee3b19..9094fca692fb 100644 --- a/fs/f2fs/crypto_key.c +++ b/fs/f2fs/crypto_key.c @@ -202,9 +202,11 @@ retry: 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; @@ -215,10 +217,12 @@ retry: "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; |