From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03DBCC388F9 for ; Tue, 27 Oct 2020 17:38:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF08B22202 for ; Tue, 27 Oct 2020 17:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603820305; bh=GAEcYI73tOo/0HcEuL9S2l4FtNXoCbXC1XuSr4iDeCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MUBAmcS5Ys5FlANodVS7bW9c8Zi3lzmKyNFFiTq4wj/9N/fk1MC7EFovWNaOSL07S 4xhk/mQvK4ssh3oCuhA5G1R2r+FBLjSR2UgjlyKA1Q0tq3DbEj06PrrC54GadP/+rw ks7zes93gjbiO8BxsdA7BTcUUCL747EkFpoTiGBI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760352AbgJ0Oeo (ORCPT ); Tue, 27 Oct 2020 10:34:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:60456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2902453AbgJ0Odb (ORCPT ); Tue, 27 Oct 2020 10:33:31 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 C293020773; Tue, 27 Oct 2020 14:33:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809211; bh=GAEcYI73tOo/0HcEuL9S2l4FtNXoCbXC1XuSr4iDeCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFLCVMVL9QgfQBQNxgHpO5W3Ts3WkJabsBHcTdcHlki2zxtpATxftPlIUk7yvH5bU rNFWAQEO1tSYV+xlmxhjPpnwm6cDGqmV+1MGO7goLKad+tBXBVl8V6uqT7MLMwH3ui yM0QSr8WluUNvYFyvVIPDWKwmPUopMYrGCGigFtY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tero Kristo , Herbert Xu , Sasha Levin Subject: [PATCH 5.4 085/408] crypto: omap-sham - fix digcnt register handling with export/import Date: Tue, 27 Oct 2020 14:50:23 +0100 Message-Id: <20201027135459.012909578@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tero Kristo [ Upstream commit 3faf757bad75f3fc1b2736f0431e295a073a7423 ] Running export/import for hashes in peculiar order (mostly done by openssl) can mess up the internal book keeping of the OMAP SHA core. Fix by forcibly writing the correct DIGCNT back to hardware. This issue was noticed while transitioning to openssl 1.1 support. Fixes: 0d373d603202 ("crypto: omap-sham - Add OMAP4/AM33XX SHAM Support") Signed-off-by: Tero Kristo Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/omap-sham.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index aba5db3c0588f..d7c0c982ba433 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -453,6 +453,9 @@ static void omap_sham_write_ctrl_omap4(struct omap_sham_dev *dd, size_t length, struct omap_sham_reqctx *ctx = ahash_request_ctx(dd->req); u32 val, mask; + if (likely(ctx->digcnt)) + omap_sham_write(dd, SHA_REG_DIGCNT(dd), ctx->digcnt); + /* * Setting ALGO_CONST only for the first iteration and * CLOSE_HASH only for the last one. Note that flags mode bits -- 2.25.1