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=-9.8 required=3.0 tests=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 6654DC43603 for ; Wed, 11 Dec 2019 15:18:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D6672073D for ; Wed, 11 Dec 2019 15:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077501; bh=4I0T3q26ZC/IpmhFP0sZA/I+ERS2Sv7601iexpXWXBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XMJAJHoVthjVpwQ0/ya1Fzvxiimia6Ss/Q9bCcZt0rRKhmyijN8yGGo3UUGgRCiHk 8NjJFXB+vEOxvZ9p+16tAQhzkS6K2vB38sBOg5WhtA4fLvAfp3FnavysUEVp9NojSU TLVcQJDVOXncBDLO8BnQqgFZLBrv7dfWuLeNcCI8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730735AbfLKPSU (ORCPT ); Wed, 11 Dec 2019 10:18:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:46122 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731384AbfLKPSP (ORCPT ); Wed, 11 Dec 2019 10:18:15 -0500 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 476C422527; Wed, 11 Dec 2019 15:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077494; bh=4I0T3q26ZC/IpmhFP0sZA/I+ERS2Sv7601iexpXWXBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hl26FWTmNAeTOTb/frj+mO8Vr0Vo8uf5zPXT6eDuaGBHZIlv/3etlia52bex1vPJ/ P/WWs7fC+b2JMhwlR4CLTusVUvovig4PH1E9GWtO8nTdomzTUVXbBq4xc1XWwTGyhw sJ+34ZV8Yd7aPsRmIb2F1/SOasNBQ1/M2cQC4d2E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Raveendra Padasalagi , Herbert Xu , Sasha Levin Subject: [PATCH 4.19 059/243] crypto: bcm - fix normal/non key hash algorithm failure Date: Wed, 11 Dec 2019 16:03:41 +0100 Message-Id: <20191211150343.084850526@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Raveendra Padasalagi [ Upstream commit 4f0129d13e69bad0363fd75553fb22897b32c379 ] Remove setkey() callback handler for normal/non key hash algorithms and keep it for AES-CBC/CMAC which needs key. Fixes: 9d12ba86f818 ("crypto: brcm - Add Broadcom SPU driver") Signed-off-by: Raveendra Padasalagi Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/bcm/cipher.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c index cd464637b0cb6..49c0097fa4749 100644 --- a/drivers/crypto/bcm/cipher.c +++ b/drivers/crypto/bcm/cipher.c @@ -4634,12 +4634,16 @@ static int spu_register_ahash(struct iproc_alg_s *driver_alg) hash->halg.statesize = sizeof(struct spu_hash_export_s); if (driver_alg->auth_info.mode != HASH_MODE_HMAC) { - hash->setkey = ahash_setkey; hash->init = ahash_init; hash->update = ahash_update; hash->final = ahash_final; hash->finup = ahash_finup; hash->digest = ahash_digest; + if ((driver_alg->auth_info.alg == HASH_ALG_AES) && + ((driver_alg->auth_info.mode == HASH_MODE_XCBC) || + (driver_alg->auth_info.mode == HASH_MODE_CMAC))) { + hash->setkey = ahash_setkey; + } } else { hash->setkey = ahash_hmac_setkey; hash->init = ahash_hmac_init; -- 2.20.1