From patchwork Mon May 20 12:14:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 164628 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp238976ili; Mon, 20 May 2019 05:42:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzuiVmb/0+unMs71CHfwxj9Q91v9CjIcft6aHOopOw4qvRzhoSGGcl/ruK+o1zqyvDhcAUr X-Received: by 2002:a17:902:e7:: with SMTP id a94mr50826821pla.182.1558356135489; Mon, 20 May 2019 05:42:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558356135; cv=none; d=google.com; s=arc-20160816; b=0hiv4YYTXia27G5IfWLdmchpXbW6PT8bbW/2Kac7OgcgCEY3AX6mFvToe5YYhSMi+4 qFJp/I8p5brm/SNR7Q1HLIAHWrkfkVa1oMm1X2Az1JlBeElrywpv8ZuJ4WsKnaqDd9pT b7GS5K4gW6kBKZsyg6PecMgqsmEEwJEjVRA7cB5v2zxspCuU4auEbkhvyUCqeG0HXkx+ VNU3VNxpe8TVsH7AIF+qiO5ElvhT4P2uFxuBFQxu2SmdD2IxP0a/JqX7RYwSicISjTRJ w8kAl0Wr/xpLrQdV43D3XswPujndhluTqQ57RlS7sKxt/EJn+NV2m4BEweL/TbjDl3K6 uI4g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LtroVFnyPKtphhy4gu8/w51VaQjDJn9KLsOjVGnTQlo=; b=l6xtsewCNDN2oHI/hWMJ634u+wb3hT9uWWAENZgwBAQ0WFWlMJsrUTX4u50qPLhbdK /cPXcIKrpAufSDTvqPrihI4uUOrgICcuzfK8ff+y01/+sToESbEv5/AEkCTdnMytE69i vLAux5PjTuqB907ISbK+wjAb/4bCFhjgVlwc3v1t4faYvuXtBXXVrqt3WHd5hkVYTF4/ V7Ws8+jvZ4T15DhkOamO5LoKvCSpIIcAEcn2Ogj/xussIWl+JJKzvlD9JCD8FRZiRHgX Yg3HQLp2xhCRvlOCv+v68UVUemlajclOZ51tYZq23/PqT09uhj0lxJpeIVoP7L6HD+0s 34Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XnuQro13; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 e11si12396932pgv.569.2019.05.20.05.42.11; Mon, 20 May 2019 05:42:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XnuQro13; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390802AbfETMdt (ORCPT + 30 others); Mon, 20 May 2019 08:33:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:50890 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388747AbfETMdo (ORCPT ); Mon, 20 May 2019 08:33:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3EECA216C4; Mon, 20 May 2019 12:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355623; bh=N8d2+4SnFNE53BBI5L7qN6qxAsHj6sYtOtlPLCR3Gi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XnuQro13hitw8u8mROkRHhXfs78J5KZ+U/Bdk2i926WfhGVSzrQHlX/yvLnymQkgB p6seD953YHR7tzxLMoBeVZqUkONz27jVgKg5/HWZivH8prlnbSsLJW062ZAC9TBiPZ dGdOKPQqdKaZGS+FsWHRBFJcs7i1Vct+m0QWiOQM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gilad Ben-Yossef , Herbert Xu Subject: [PATCH 5.1 063/128] crypto: ccree - use correct internal state sizes for export Date: Mon, 20 May 2019 14:14:10 +0200 Message-Id: <20190520115254.045239986@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115249.449077487@linuxfoundation.org> References: <20190520115249.449077487@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gilad Ben-Yossef commit f3df82b468f00cca241d96ee3697c9a5e7fb6bd0 upstream. 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+ Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccree/cc_hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/crypto/ccree/cc_hash.c +++ b/drivers/crypto/ccree/cc_hash.c @@ -1639,7 +1639,7 @@ static struct cc_hash_template driver_ha .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, @@ -1666,7 +1666,7 @@ static struct cc_hash_template driver_ha .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,