From patchwork Thu Apr 18 13:39:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 162493 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp762544jan; Thu, 18 Apr 2019 06:41:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqxIGq83i5j/xEAaiQETFy/nfxuak0NSeErMEqLk14TMlw/cM4MrxgX4Z5lyx77wphjlrF8P X-Received: by 2002:a17:902:e183:: with SMTP id cd3mr79782627plb.233.1555594917217; Thu, 18 Apr 2019 06:41:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555594917; cv=none; d=google.com; s=arc-20160816; b=cvBATVj2MRoZACcc0OjO/CxLpDhEraSkJ/lUfvoaZB8kxSH17njPGm7nV9kIEP39sB ULcXhGFJFHxCoZGp/4PoM1al+ff8Netf1cUrXzXtv7fNDDVI5rR1CyluzaRhoyDdzoZ9 ppHJe961h6mXuhZhfMdIYlX1g8qPt/xiypdtAVDJx2iQWW9GoHc6wG5M22Da2tH8I9hh lYvPDeINK5jpA3o5Y9d/s/nmPO+3TkKrdmMKXzC+YkyzKmsjBjcmXjpTsSSJs9rxQqem TAiSwKM4QQvwrxhY/0/p8rNYxF0BWG5SZhcAoZRvXPASIyPdTWbLWUmBfSEmacM9wG3w jZBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=csrECCfVu3zxeskLL/s5BUMKlkqF4YQY9itdP1pmJ0U=; b=M5GPjFlZAIUf+licbe3fDMfTiOHsVwLCfpLLBC+pCHBqbQlm1WcyepYxui5opEtzui Yu7QELvTm4ZRakGpt/s8DFNiEIo5JhzR8/GalwrRHZWwyynm7NpDIc26+ngmqGP/+/i3 e0toV3tRHuvCHpvY15AXanIJUHrxGoXvVKGljgW94uMleKcMAtyTmtoZQuX0t0EfRjHK BHjzm8HOGcZ4szATwGUzcrongqRImn3U78JKsZs5Iz/eGmZI3pA/qVz8EssjKROMZLLL U5I+4eJs8E+HmplBqOhu9fsVpScAgklIMNdAdCKOrazdPPkd4BW0sU+DBsxhk6rAvNbP S3cw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x6si1932788pga.310.2019.04.18.06.41.56; Thu, 18 Apr 2019 06:41:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389247AbfDRNlz (ORCPT + 14 others); Thu, 18 Apr 2019 09:41:55 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:33726 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389226AbfDRNlz (ORCPT ); Thu, 18 Apr 2019 09:41:55 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 22A9C80D; Thu, 18 Apr 2019 06:41:55 -0700 (PDT) Received: from e110176-lin.kfn.arm.com (e110176-lin.kfn.arm.com [10.50.4.178]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7A9193F5AF; Thu, 18 Apr 2019 06:41:53 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" Cc: Ofir Drang , stable@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 27/35] crypto: ccree: use correct internal state sizes for export Date: Thu, 18 Apr 2019 16:39:02 +0300 Message-Id: <20190418133913.9122-28-gilad@benyossef.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418133913.9122-1-gilad@benyossef.com> References: <20190418133913.9122-1-gilad@benyossef.com> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org We were computing the size of the import buffer based on the digest size but the 318 and 224 byte variants use 512 and 256 bytes internal state sizes respectfully, thus causing the import buffer to overrun. Fix it by using the right sizes. Signed-off-by: Gilad Ben-Yossef Cc: stable@vger.kernel.org # v4.19+ --- drivers/crypto/ccree/cc_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.21.0 diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c index 940101fee68e..36e9fb4141f8 100644 --- a/drivers/crypto/ccree/cc_hash.c +++ b/drivers/crypto/ccree/cc_hash.c @@ -1633,7 +1633,7 @@ static struct cc_hash_template driver_hash[] = { .setkey = cc_hash_setkey, .halg = { .digestsize = SHA224_DIGEST_SIZE, - .statesize = CC_STATE_SIZE(SHA224_DIGEST_SIZE), + .statesize = CC_STATE_SIZE(SHA256_DIGEST_SIZE), }, }, .hash_mode = DRV_HASH_SHA224, @@ -1660,7 +1660,7 @@ static struct cc_hash_template driver_hash[] = { .setkey = cc_hash_setkey, .halg = { .digestsize = SHA384_DIGEST_SIZE, - .statesize = CC_STATE_SIZE(SHA384_DIGEST_SIZE), + .statesize = CC_STATE_SIZE(SHA512_DIGEST_SIZE), }, }, .hash_mode = DRV_HASH_SHA384,