From patchwork Tue Oct 27 13:47:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 307129 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 26E74C6379D for ; Tue, 27 Oct 2020 17:26:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CEC4421D42 for ; Tue, 27 Oct 2020 17:26:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819614; bh=1IGw4xfsi9bFj7FNqePBrV919CCINvk8nB+qwLrJbGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TvkTqezsZ9tvKmuFiIcfFS0DX8j7KvbTT577+voahc045ZiGeCAkJLkWSjzwANweo ExCy6UxpKJHzX1rm7YIhklW1aB5OKOzVZgQgTH+o8cMlp6X1cB0dUaAX8w63FnheXD QeMk9gfeq6EeyVZ2TpFsmpNmsa8tqc4uaUufzEAc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1819039AbgJ0R0w (ORCPT ); Tue, 27 Oct 2020 13:26:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:53876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752049AbgJ0Oxb (ORCPT ); Tue, 27 Oct 2020 10:53: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 B2FBA22265; Tue, 27 Oct 2020 14:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810411; bh=1IGw4xfsi9bFj7FNqePBrV919CCINvk8nB+qwLrJbGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFCDoP6U2H/PkPa1M0A1srybAzteculvnU57i39sjltSgPJqIrRcXYS1Vk+4vlX11 45bKVvZrmjTS3KuZOGPpkXSK+euhfE4ertCkKrH9X6ZjNjQ3H2x6NHf3UTJgk/0bqa uZryTX7yBuDRkdUV5B5bM4S49sL3F/au6peC0UHo= 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.8 129/633] crypto: omap-sham - fix digcnt register handling with export/import Date: Tue, 27 Oct 2020 14:47:52 +0100 Message-Id: <20201027135528.741226161@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 82691a057d2a1..bc956dfb34de6 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -456,6 +456,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