Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d76d99b2 authored by Laurent Navet's avatar Laurent Navet Committed by Theodore Ts'o
Browse files

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: default avatarLaurent Navet <laurent.navet@gmail.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5ba92bcf

fs/ext4/crypto_key.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -220,6 +220,8 @@ int _ext4_get_encryption_info(struct inode *inode) 
	BUG_ON(master_key->size != EXT4_AES_256_XTS_KEY_SIZE);

	BUG_ON(master_key->size != EXT4_AES_256_XTS_KEY_SIZE);

	res = ext4_derive_key_aes(ctx.nonce, master_key->raw,

	res = ext4_derive_key_aes(ctx.nonce, master_key->raw,

				  raw_key);

				  raw_key);

	if (res)

		goto out;

got_key:

got_key:

	ctfm = crypto_alloc_ablkcipher(cipher_str, 0, 0);

	ctfm = crypto_alloc_ablkcipher(cipher_str, 0, 0);

	if (!ctfm || IS_ERR(ctfm)) {

	if (!ctfm || IS_ERR(ctfm)) {