From: Ryder Lee Date: Tue, 22 Aug 2017 07:53:39 +0000 (+0800) Subject: crypto: mediatek - Add empty messages check in GCM mode X-Git-Tag: v4.15-rc1~139^2~154 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e47270665b5fcdf8a9ae628e603119e998ca3715;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Herbert Xu --- diff --git a/drivers/crypto/mediatek/mtk-aes.c b/drivers/crypto/mediatek/mtk-aes.c index 9e845e866dec7..72e4549ed36b8 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),