diff options
| author | Theodore Ts'o <tytso@google.com> | 2015-12-31 17:24:40 -0500 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-29 03:52:06 +0200 |
| commit | fc3bd71d5796bef30162f183cc7c2fd3d442afb5 (patch) | |
| tree | 954edde112b3cf2f168a78bed3b87c1baa42e4c9 | |
| parent | 4f83b8f1f7b7a7ad6c64556eabb180991b0b639b (diff) | |
ext4 crypto: add missing locking for keyring_key access
Cc: stable@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: "Theodore Ts'o" <tytso@google.com>
Change-Id: Ia13629b6512a0c5dd2a09e7e3676c74af20c96a3
| -rw-r--r-- | fs/ext4/crypto_key.c | 4 |
1 files changed, 4 insertions, 0 deletions
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: |