ext4 crypto: exit cleanly if ext4_derive_key_aes() fails

mali · Brad Figg · commit faada2001021 · 2016-02-01T14:21:46.000-08:00
BugLink: http://bugs.launchpad.net/bugs/1540532 commit d76d99b upstream. 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> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
@@ -230,6 +230,8 @@ int _ext4_get_encryption_info(struct inode *inode)
 	}
 	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)) {

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,8 @@ int _ext4_get_encryption_info(struct inode *inode)`
`230`	`230`	`}`
`231`	`231`	`res = ext4_derive_key_aes(ctx.nonce, master_key->raw,`
`232`	`232`	`raw_key);`
	`233`	`+ if (res)`
	`234`	`+ goto out;`
`233`	`235`	`got_key:`
`234`	`236`	`ctfm = crypto_alloc_ablkcipher(cipher_str, 0, 0);`
`235`	`237`	`if (!ctfm \|\| IS_ERR(ctfm)) {`