diff options
| author | Gilad Ben-Yossef <gilad@benyossef.com> | 2020-02-02 18:19:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-17 10:48:54 +0200 |
| commit | dd5f4a04077b9d45549753eee6d6a8f84e6b9828 (patch) | |
| tree | 4dedd37d04e234114f5b9efed4d55dd09d4de22f | |
| parent | a44ed69822708f73a1fa02782ba424f7d22077a1 (diff) | |
| download | linux-dd5f4a04077b9d45549753eee6d6a8f84e6b9828.tar.gz linux-dd5f4a04077b9d45549753eee6d6a8f84e6b9828.tar.bz2 linux-dd5f4a04077b9d45549753eee6d6a8f84e6b9828.zip | |
crypto: ccree - dec auth tag size from cryptlen map
[ Upstream commit 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 ]
Remove the auth tag size from cryptlen before mapping the destination
in out-of-place AEAD decryption thus resolving a crash with
extended testmgr tests.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: stable@vger.kernel.org # v4.19+
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/crypto/ccree/cc_buffer_mgr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c index 6681d113c0d6..77e31191e408 100644 --- a/drivers/crypto/ccree/cc_buffer_mgr.c +++ b/drivers/crypto/ccree/cc_buffer_mgr.c @@ -1021,8 +1021,12 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata, if (req->src != req->dst) { size_for_map = areq_ctx->assoclen + req->cryptlen; - size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ? - authsize : 0; + + if (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) + size_for_map += authsize; + else + size_for_map -= authsize; + if (is_gcm4543) size_for_map += crypto_aead_ivsize(tfm); |