From patchwork Tue Oct 27 13:46:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312628 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 48C7CC64E7B for ; Tue, 27 Oct 2020 15:27:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EFDB322275 for ; Tue, 27 Oct 2020 15:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812436; bh=OT9RbLQ+55lQch78L1BgrwIBr45rCdWWmf3QG8E8c5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EAtkQoAYDyArj1GO281OdqY5TqsRNuQeO3mm0aKpG9ZLhq9cV2v/XquyaXyN4jgPn tXE0ErDdQGqeNFMLWoLImEl0VuzTVTnet+/XsuVLffV671cmQ3DSibJFBYCBQM4+Wd 0M0kfjebQTHu02GcoOcur/jVhDrfaPWtdzWFmXdk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S368728AbgJ0P1N (ORCPT ); Tue, 27 Oct 2020 11:27:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:39774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1797593AbgJ0PY3 (ORCPT ); Tue, 27 Oct 2020 11:24:29 -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 E99F72064B; Tue, 27 Oct 2020 15:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812268; bh=OT9RbLQ+55lQch78L1BgrwIBr45rCdWWmf3QG8E8c5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=icjUCaN22/rUJn2ipdYN87eCTSb7pgTssYaApGd84gkgl9E+HT9bXnz4W/8gp3pHg Oh/r9jQpjVLqObaL3FZTNCJ/QSYsBNklEi3EatjIRQ1spASz10Ge6K8UcVEWm9IA2q pcHO3eE+23UtOcqgVamuuEVLYiJZSSY4Vn778hb8= 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.9 150/757] crypto: omap-sham - fix digcnt register handling with export/import Date: Tue, 27 Oct 2020 14:46:40 +0100 Message-Id: <20201027135457.644597000@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@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 954d703f29811..89ed055f21bf4 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