diff options
| author | Eric Biggers <ebiggers@google.com> | 2021-08-24 22:59:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-15 09:50:30 +0200 |
| commit | 80b1a70b045051ae3e5497565c6f6c24962d6c77 (patch) | |
| tree | e408775e818ab32fbc05afdd53448bb3a9d803f9 /block | |
| parent | ba6e5af621ab2fb4cd4acb37d4914c832991689c (diff) | |
| download | linux-stable-80b1a70b045051ae3e5497565c6f6c24962d6c77.tar.gz linux-stable-80b1a70b045051ae3e5497565c6f6c24962d6c77.tar.bz2 linux-stable-80b1a70b045051ae3e5497565c6f6c24962d6c77.zip | |
blk-crypto: fix check for too-large dun_bytes
[ Upstream commit cc40b7225151f611ef837f6403cfaeadc7af214a ]
dun_bytes needs to be less than or equal to the IV size of the
encryption mode, not just less than or equal to BLK_CRYPTO_MAX_IV_SIZE.
Currently this doesn't matter since blk_crypto_init_key() is never
actually passed invalid values, but we might as well fix this.
Fixes: a892c8d52c02 ("block: Inline encryption support for blk-mq")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20210825055918.51975-1-ebiggers@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-crypto.c b/block/blk-crypto.c index 5da43f0973b4..5ffa9aab49de 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -332,7 +332,7 @@ int blk_crypto_init_key(struct blk_crypto_key *blk_key, const u8 *raw_key, if (mode->keysize == 0) return -EINVAL; - if (dun_bytes == 0 || dun_bytes > BLK_CRYPTO_MAX_IV_SIZE) + if (dun_bytes == 0 || dun_bytes > mode->ivsize) return -EINVAL; if (!is_power_of_2(data_unit_size)) |