Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp145710imi; Wed, 20 Jul 2022 19:36:31 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tZGmCOJpRZn7dQP/tXPzzzmDVYn9QexCk1oUyPQOs6/lQFZncEO12cpjpKytDV2/10CD9t X-Received: by 2002:a63:82c1:0:b0:415:d42c:1653 with SMTP id w184-20020a6382c1000000b00415d42c1653mr35845792pgd.334.1658370991311; Wed, 20 Jul 2022 19:36:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658370991; cv=none; d=google.com; s=arc-20160816; b=TuNR/2lgehpC9UBq+K0ISz39q8CXORei/ptc2tWN52mhD8E8FBi3YTdQ/qHddfYLKj 2ZEps5NknrJvTErgIAXrtRwV6N9i8ViTe6eLmiF0BdZbqOvNpUW1is0shtpcdCUZIMaJ uJ9qxb5KJCc+Lztzkh8+Qx9cAUsZBwraZWo3RnIUAGbX21kEZhvH/naUv3Gsw+MXeKXO NIZFy9sluukwEu38eJ4dLyEX3ru8vgcTfSIlBfESoN8vwbEErJh3QMTApgieN4NNALB1 MAZs+ESL+PbcVzthPiK8QjEucWmWAPhRRCCfEjo+0INUquB/Glvd6AVFnbk6xs9DN5MB RflQ== 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=dcAE+wQ4P1k0nFMwrixPEzIYtJWAsvhaUdXNC8fRMlg=; b=yqxi7iZjhwUsiB5iE3D9KUgiaGEApKiTkwzxRaQJIBIQEBs9iGMgW4hgGQnpnY0Yxn odyWJ4gwzqyLeUQLZuu1MXVqT0QmCkTe9zOknTE+KZJQcenZamRRXA4tB6PXVfZZQjrA qhKRyWfAxKyqzKRHRLcBwxmbcumKu2W8GBgxhSypXHkbHm6w+QxY5gGLeD1zQUzcUUQs 7kTl6MgjUDYNCcywvC6osZM37jhhbd+jmR10CLeWuvoggBtjH6jGI988y4vMxcf2kRdf 4E6POutP4SrOjGGrV9xBTz+SoEVwO5qt4BstISNEZThQjtLP7V134IIXyU+N4WCctYt0 yuBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q23-20020a631f57000000b0040c9268b3e9si582030pgm.723.2022.07.20.19.36.02; Wed, 20 Jul 2022 19:36:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231658AbiGUCZb (ORCPT + 99 others); Wed, 20 Jul 2022 22:25:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231302AbiGUCZ3 (ORCPT ); Wed, 20 Jul 2022 22:25:29 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EE55B1FA; Wed, 20 Jul 2022 19:25:24 -0700 (PDT) Received: from dggpeml500020.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4LpGYn1kY5z1M8Gr; Thu, 21 Jul 2022 10:22:37 +0800 (CST) Received: from dggpeml100012.china.huawei.com (7.185.36.121) by dggpeml500020.china.huawei.com (7.185.36.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 21 Jul 2022 10:25:21 +0800 Received: from huawei.com (10.67.165.24) by dggpeml100012.china.huawei.com (7.185.36.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 21 Jul 2022 10:25:21 +0800 From: Kai Ye To: CC: , , , Subject: [PATCH] crypto: hisilicon/sec - fix auth key size error Date: Thu, 21 Jul 2022 10:18:31 +0800 Message-ID: <20220721021831.25609-1-yekai13@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml100012.china.huawei.com (7.185.36.121) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The authentication algorithm supports a maximum of 128-byte keys. The allocated key memory is insufficient. Signed-off-by: Kai Ye --- drivers/crypto/hisilicon/sec2/sec_crypto.c | 6 +++--- drivers/crypto/hisilicon/sec2/sec_crypto.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c index 53285b0e70d3..d08e2ad8865c 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -662,7 +662,7 @@ static int sec_auth_init(struct sec_ctx *ctx) { struct sec_auth_ctx *a_ctx = &ctx->a_ctx; - a_ctx->a_key = dma_alloc_coherent(ctx->dev, SEC_MAX_KEY_SIZE, + a_ctx->a_key = dma_alloc_coherent(ctx->dev, SEC_MAX_AKEY_SIZE, &a_ctx->a_key_dma, GFP_KERNEL); if (!a_ctx->a_key) return -ENOMEM; @@ -674,8 +674,8 @@ static void sec_auth_uninit(struct sec_ctx *ctx) { struct sec_auth_ctx *a_ctx = &ctx->a_ctx; - memzero_explicit(a_ctx->a_key, SEC_MAX_KEY_SIZE); - dma_free_coherent(ctx->dev, SEC_MAX_KEY_SIZE, + memzero_explicit(a_ctx->a_key, SEC_MAX_AKEY_SIZE); + dma_free_coherent(ctx->dev, SEC_MAX_AKEY_SIZE, a_ctx->a_key, a_ctx->a_key_dma); } diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.h b/drivers/crypto/hisilicon/sec2/sec_crypto.h index 5e039b50e9d4..d033f63b583f 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.h +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.h @@ -7,6 +7,7 @@ #define SEC_AIV_SIZE 12 #define SEC_IV_SIZE 24 #define SEC_MAX_KEY_SIZE 64 +#define SEC_MAX_AKEY_SIZE 128 #define SEC_COMM_SCENE 0 #define SEC_MIN_BLOCK_SZ 1 -- 2.30.0