From: Laurent Navet <laurent.navet@gmail.com>
Date: Wed, 22 Jul 2015 04:08:08 +0000 (-0400)
Subject: ext4 crypto: exit cleanly if ext4_derive_key_aes() fails
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d76d99b219e1a233a720775c0451c310d34594e8;p=deliverable%2Flinux.git

ext4 crypto: exit cleanly if ext4_derive_key_aes() fails

Return value of ext4_derive_key_aes() is stored but not used.
Add test to exit cleanly if ext4_derive_key_aes() fail.
Also fix coverity CID 1309760.

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
index 442d24e8efc0..ce75bc8b9aef 100644
--- a/fs/ext4/crypto_key.c
+++ b/fs/ext4/crypto_key.c
@@ -220,6 +220,8 @@ retry:
 	BUG_ON(master_key->size != EXT4_AES_256_XTS_KEY_SIZE);
 	res = ext4_derive_key_aes(ctx.nonce, master_key->raw,
 				  raw_key);
+	if (res)
+		goto out;
 got_key:
 	ctfm = crypto_alloc_ablkcipher(cipher_str, 0, 0);
 	if (!ctfm || IS_ERR(ctfm)) {