Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 updates from Ted Ts'o:
 "Some locking and page fault bug fixes from Jan Kara, some ext4
  encryption fixes from me, and Li Xi's Project Quota commits"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  fs: clean up the flags definition in uapi/linux/fs.h
  ext4: add FS_IOC_FSSETXATTR/FS_IOC_FSGETXATTR interface support
  ext4: add project quota support
  ext4: adds project ID support
  ext4 crypto: simplify interfaces to directory entry insert functions
  ext4 crypto: add missing locking for keyring_key access
  ext4: use pre-zeroed blocks for DAX page faults
  ext4: implement allocation of pre-zeroed blocks
  ext4: provide ext4_issue_zeroout()
  ext4: get rid of EXT4_GET_BLOCKS_NO_LOCK flag
  ext4: document lock ordering
  ext4: fix races of writeback with punch hole and zero range
  ext4: fix races between buffered IO and collapse / insert range
  ext4: move unlocked dio protection from ext4_alloc_file_blocks()
  ext4: fix races between page faults and hole punching

1 files changed, 4 insertions, 0 deletions

diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
index c5882b36e558..9a16d1e75a49 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 = user_key_payload(keyring_key);
         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: