2015-07-09 20:07:14

by Laurent Navet

Subject: [PATCH V2] 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 <[email protected]>
---
fs/ext4/crypto_key.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
index 442d24e..ce75bc8 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)) {
--
2.1.4

2015-07-22 04:09:03

by Theodore Ts'o

Subject: Re: [PATCH V2] ext4 crypto: exit cleanly if ext4_derive_key_aes() fails

On Thu, Jul 09, 2015 at 10:07:14PM +0200, Laurent Navet wrote:
> 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 <[email protected]>

Thanks, applied.

- Ted