summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/mediatek
diff options
context:
space:
mode:
authorRyder Lee <ryder.lee@mediatek.com>2017-08-22 15:53:39 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2017-09-22 17:43:08 +0800
commite47270665b5fcdf8a9ae628e603119e998ca3715 (patch)
tree360dbd14aef94b8a2b13e2233917d6af2143cef0 /drivers/crypto/mediatek
parentb7e2753040a2fef0f748c615121577da3f846781 (diff)
downloadlinux-e47270665b5fcdf8a9ae628e603119e998ca3715.tar.gz
linux-e47270665b5fcdf8a9ae628e603119e998ca3715.tar.bz2
linux-e47270665b5fcdf8a9ae628e603119e998ca3715.zip
crypto: mediatek - Add empty messages check in GCM mode
Currently, empty messages are not supported in GCM mode, hence add a check to prevent producing incorrect results. Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/mediatek')
-rw-r--r--drivers/crypto/mediatek/mtk-aes.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c
index 9e845e866dec..72e4549ed36b 100644
--- a/drivers/crypto/mediatek/mtk-aes.c
+++ b/drivers/crypto/mediatek/mtk-aes.c
@@ -928,8 +928,13 @@ static int mtk_aes_gcm_start(struct mtk_cryp *cryp, struct mtk_aes_rec *aes)
static int mtk_aes_gcm_crypt(struct aead_request *req, u64 mode)
{
struct mtk_aes_base_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
+ struct mtk_aes_gcm_ctx *gctx = mtk_aes_gcm_ctx_cast(ctx);
struct mtk_aes_reqctx *rctx = aead_request_ctx(req);
+ /* Empty messages are not supported yet */
+ if (!gctx->textlen && !req->assoclen)
+ return -EINVAL;
+
rctx->mode = AES_FLAGS_GCM | mode;
return mtk_aes_handle_queue(ctx->cryp, !!(mode & AES_FLAGS_ENCRYPT),