ext4 crypto: add missing locking for keyring_key access

Cc: [email protected] Signed-off-by: Theodore Ts'o <[email protected]>
iegor · Dec 10, 2015 · db7730e · db7730e
1 parent ba5843f
commit db7730e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
@@ -213,9 +213,11 @@ int _ext4_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 ext4_encryption_key)) {
 		res = -EINVAL;
+		up_read(&keyring_key->sem);
 		goto out;
 	}
 	master_key = (struct ext4_encryption_key *)ukp->data;
@@ -226,10 +228,12 @@ int _ext4_get_encryption_info(struct inode *inode)
 			    "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: