From patchwork Mon May 20 12:14:01 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: 164631 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp242638ili; Mon, 20 May 2019 05:45:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8WY2IDQnvN+L3c9FyI4xfMFs+Q347g9PaJAWBs9fi7c+4ii60s1VTDlQyuLbOCBRL7cJL X-Received: by 2002:a65:4144:: with SMTP id x4mr16790078pgp.282.1558356355191; Mon, 20 May 2019 05:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558356355; cv=none; d=google.com; s=arc-20160816; b=hejP7jx1AwOkI58xmkXjhDvRip2kEmGY2mPhcQYUMAGrMDMOTw23gwvAJ9oF9kIbWZ CgItO6+XzZY/XtTarTsKaTjZ88nWIp3+S2n2Nq9gR39KjLebFUYPyDYYUi1onPAeSjUd 18w/PyaSf0/v0ZjNLDE+cxkelHOT7rHJLul7okU2fP/LCRqUjAsRNq13ROq0FDswzSaR Vr43OKM/UGvMxB4VEUwrPRhIXFUO3rKwOT1XFpMQOxygo389wCQMOgxZD+B53gYFaFju cJrjJP8oo1/xg5SV4aleVkJjTKzQxbaggEDgYhoawvnK5PkbMlvPlVnHoMS+qUS+B9i5 dOTA== 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=joSj4vpztn+ZudemYPgD7cBaSS1PgWYfjckhvmJ42yLY1EPmg3c3pRU+4eyU7/olGv QM0NO4jBZCEeGCacKkmFOJnK8ml9SfuSxWaTeiPCIlzVURiFEZOi8bNxbqwaw005REs6 AkoYKCoODmEdCMG8evBAPSM1y3VZiYgwU9VFBczn3wuS1MrGc7mHFSieMluJyJ9Kwu6a r0MxD6ShH7lq2UZb38u83gssWO9/ReNjJTI0AGv04VBxIp75kJTcMq85P4S89MFYyrGv /nZD9kRsZayq/hOC5p556VF2x24nkOBj191wwE+hU3QZvTObS+Ubag6glzsdXB9Jmqvi XPCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yjPbh4PX; 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.45.51; Mon, 20 May 2019 05:45:55 -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=yjPbh4PX; 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 S2389968AbfETM3s (ORCPT + 30 others); Mon, 20 May 2019 08:29:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:45880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388848AbfETM3o (ORCPT ); Mon, 20 May 2019 08:29: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 EC592216C4; Mon, 20 May 2019 12:29:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355383; bh=N8d2+4SnFNE53BBI5L7qN6qxAsHj6sYtOtlPLCR3Gi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yjPbh4PXCBEIQXIoosG3VbObPE+NbO10pniIilzhOtxiu2YXSDoCtoV8L6CIoLu5e OIQf8TBnWEg2cT4t1+NyfdCd0q1npjiSqqEihSKUJkW7d7PHp33FnMKt9AL3XJGuxH JosPy/8RNoidAQCcCHuojR2sy5/tywBaA7cFspeA= 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.0 061/123] crypto: ccree - use correct internal state sizes for export Date: Mon, 20 May 2019 14:14:01 +0200 Message-Id: <20190520115248.849293422@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115245.439864225@linuxfoundation.org> References: <20190520115245.439864225@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,