Received: by 2002:a05:7412:b101:b0:e2:908c:2ebd with SMTP id az1csp3003087rdb; Wed, 15 Nov 2023 18:18:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/EnbPg/oMehruYBt/8kIJpW0yULd4cSMwoMghbwUfSx4M64SzhsOxRaFop9eNzsSZKYs1 X-Received: by 2002:a05:6a20:72a2:b0:187:c494:37f2 with SMTP id o34-20020a056a2072a200b00187c49437f2mr94774pzk.4.1700101137164; Wed, 15 Nov 2023 18:18:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700101137; cv=none; d=google.com; s=arc-20160816; b=ppKLXi/gvrAVj/Z5nx4Wmy0XYkHg5ymxpjmWYhmJHhQ4wZgKQAs/KOCSkyjj3xEBxW GHerp/OzX3acQ3W2XaJlm4elfZImk+t1o3wN30YmVQHeMOOnqb6j4WJLrf+0u4zzayag f1ohfZ8Y2kccL5717PpahIwZ8260ZSgQBur6i+ijBjrd43KHxa4bs7LwOaV99VIHAO92 lux8YWLuEYxL6EEaFS1BKEGYL4NnYiKsKtiZQ3BnQDWMkjblhFakmExyufswhJ4J23sg FYdmSMNTnB23ETHl6YIo7516uncBpuglzVnxmHE3GMnUl4+kk2TJTxzoNue/KBEumDR2 2EoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Idv1g1a57ZWc1SdLMr6681nx3rE6swE9L0osnr9z/yI=; fh=rdnr+FoQmbAgUxGRzMEhZp29EPUhv/mZBRcLrPi0wBM=; b=uuicExhDqZV/anv7mrzpuPBRPaNY/EnfORV0KhvFA8tl/AdXNzXMzD6zSeHLFiWWdq M1VOUwmadEntiNhqgflym1RS5BXvGQYQYYYUneVD0pxBELlZv9OVEYsxXedwfiavAzDF e0cOTx4FyZtqsa9mfyXeAQvlZKeaod9dmOhgV0/w1tsqx5lrJpquSMw5TvOxfcoalqXk abyiInqKdkjwXgL8fDryQtcgxiZ3yPAeyQX9D3GJZwhKSPDYAJ1+DatyzHwhUBDir9Lr Vamh1gRcgr6fLNXQeAMx8mQZw5okYOcUfL56ZEFGiRcrvC3D8FYl+O0NHmIZfBnsu56V XrOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id sf2-20020a17090b51c200b002631e44f48csi997321pjb.179.2023.11.15.18.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 18:18:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 9EE3E80ACF8E; Wed, 15 Nov 2023 18:18:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344454AbjKPCSK convert rfc822-to-8bit (ORCPT + 99 others); Wed, 15 Nov 2023 21:18:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344467AbjKPCSI (ORCPT ); Wed, 15 Nov 2023 21:18:08 -0500 Received: from fd01.gateway.ufhost.com (fd01.gateway.ufhost.com [61.152.239.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B00451AD; Wed, 15 Nov 2023 18:18:04 -0800 (PST) Received: from EXMBX166.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX166", Issuer "EXMBX166" (not verified)) by fd01.gateway.ufhost.com (Postfix) with ESMTP id 511DB7FFC; Thu, 16 Nov 2023 10:18:03 +0800 (CST) Received: from EXMBX168.cuchost.com (172.16.6.78) by EXMBX166.cuchost.com (172.16.6.76) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 16 Nov 2023 10:18:03 +0800 Received: from ubuntu.localdomain (202.188.176.82) by EXMBX168.cuchost.com (172.16.6.78) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 16 Nov 2023 10:18:00 +0800 From: Jia Jie Ho To: Herbert Xu , "David S . Miller" CC: , Subject: [PATCH] crypto: starfive - Pad adata with zeroes Date: Thu, 16 Nov 2023 10:17:52 +0800 Message-ID: <20231116021752.420680-1-jiajie.ho@starfivetech.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [202.188.176.82] X-ClientProxiedBy: EXCAS062.cuchost.com (172.16.6.22) To EXMBX168.cuchost.com (172.16.6.78) X-YovoleRuleAgent: yovoleflag Content-Transfer-Encoding: 8BIT X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 15 Nov 2023 18:18:54 -0800 (PST) Ensure padding for adata is filled with zeroes. Additional bytes for padding affects the ccm tag output even though input ad len has been provided to the hardware. Signed-off-by: Jia Jie Ho --- drivers/crypto/starfive/jh7110-aes.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/starfive/jh7110-aes.c b/drivers/crypto/starfive/jh7110-aes.c index 9378e6682f0e..e0fe599f8192 100644 --- a/drivers/crypto/starfive/jh7110-aes.c +++ b/drivers/crypto/starfive/jh7110-aes.c @@ -500,7 +500,7 @@ static int starfive_aes_prepare_req(struct skcipher_request *req, scatterwalk_start(&cryp->out_walk, rctx->out_sg); if (cryp->assoclen) { - rctx->adata = kzalloc(ALIGN(cryp->assoclen, AES_BLOCK_SIZE), GFP_KERNEL); + rctx->adata = kzalloc(cryp->assoclen + AES_BLOCK_SIZE, GFP_KERNEL); if (!rctx->adata) return dev_err_probe(cryp->dev, -ENOMEM, "Failed to alloc memory for adata"); @@ -569,7 +569,7 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq struct starfive_cryp_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req)); struct starfive_cryp_dev *cryp = ctx->cryp; - struct starfive_cryp_request_ctx *rctx = ctx->rctx; + struct starfive_cryp_request_ctx *rctx; u32 block[AES_BLOCK_32]; u32 stat; int err; @@ -579,6 +579,8 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq if (err) return err; + rctx = ctx->rctx; + if (!cryp->assoclen) goto write_text; -- 2.34.1