exit-cleanly-if-ext4_derive_key_aes-fails

   1 ext4 crypto: exit cleanly if ext4_derive_key_aes() fails
   2
   3 From: Laurent Navet <laurent.navet@gmail.com>
   4
   5 Return value of ext4_derive_key_aes() is stored but not used.
   6 Add test to exit cleanly if ext4_derive_key_aes() fail.
   7 Also fix coverity CID 1309760.
   8
   9 Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
  10 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  11 ---
  12  fs/ext4/crypto_key.c | 2 ++
  13  1 file changed, 2 insertions(+)
  14
  15 diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
  16 index 442d24e..ce75bc8 100644
  17 --- a/fs/ext4/crypto_key.c
  18 +++ b/fs/ext4/crypto_key.c
  19 @@ -220,6 +220,8 @@ retry:
  20         BUG_ON(master_key->size != EXT4_AES_256_XTS_KEY_SIZE);
  21         res = ext4_derive_key_aes(ctx.nonce, master_key->raw,
  22                                   raw_key);
  23 +       if (res)
  24 +               goto out;
  25  got_key:
  26         ctfm = crypto_alloc_ablkcipher(cipher_str, 0, 0);
  27         if (!ctfm || IS_ERR(ctfm)) {
  28 --
  29 2.1.4
  30
  31