]> git.hungrycats.org Git - linux/commitdiff
dm integrity: fail early if required HMAC key is not available
authorMilan Broz <gmazyland@gmail.com>
Tue, 13 Feb 2018 13:50:50 +0000 (14:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Nov 2018 13:52:42 +0000 (14:52 +0100)
[ Upstream commit e16b4f99f0f79682a7efe191a8ce694d87ca9fc8 ]

Since crypto API commit 9fa68f62004 ("crypto: hash - prevent using keyed
hashes without setting key") dm-integrity cannot use keyed algorithms
without the key being set.

The dm-integrity recognizes this too late (during use of HMAC), so it
allows creation and formatting of superblock, but the device is in fact
unusable.

Fix it by detecting the key requirement in integrity table constructor.

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/dm-integrity.c

index 898286ed47a1004f00e7ff23f9cb29133b0f9aa3..b10e4c5641ea37817c77dd8dfcb043c0710aa6a6 100644 (file)
@@ -2547,6 +2547,9 @@ static int get_mac(struct crypto_shash **hash, struct alg_spec *a, char **error,
                                *error = error_key;
                                return r;
                        }
+               } else if (crypto_shash_get_flags(*hash) & CRYPTO_TFM_NEED_KEY) {
+                       *error = error_key;
+                       return -ENOKEY;
                }
        }