Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp690082ybz; Wed, 29 Apr 2020 07:43:24 -0700 (PDT) X-Google-Smtp-Source: APiQypLjG8r3YZf6H7msPTKIN3Rd10nWqBzZFzJIcGOJp2kvNNBbMyjUbvUnnzCbb4j/q1lmn9el X-Received: by 2002:a17:907:2098:: with SMTP id pv24mr2984724ejb.22.1588171404672; Wed, 29 Apr 2020 07:43:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588171404; cv=none; d=google.com; s=arc-20160816; b=Dgowvrd4Taxc8y19oYrp8RuKouGcjLteHYdG0+Y+4yAmu634Bznjcp0WQeZCjLdAry zZAuzh5U+pqkq+nHwUCrw8cYmAZzcAABZ9K/2CI0cniOhjORGtfZ4TQFykChQ+iXqaST SsZtdWmPmCoGaWPuZVngjbTR0iRc6JEw66IL1kByEZ0tHp7d0om8vgLd4BdwaeTxK9Er U2qNuWeOONJAm5+c6UFZwBFsg7ts7wwbaDQCvSVZkihYF+Swj9s3mf5XFnMjgUMCllHS A31yW6rRpjhvOp0AlJKeFMCVggK57ulvv7jwG4WRfyP/SMhs7RUJP0S9hfSbPoMo1h+c o2CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ri+/lIeSNOTM3l+FNff6gZorR0Kh5OVSvczQZBkHThk=; b=QlGnxz4gxCBk59/3Uvy2vdqgC5f0M227Y8rlOsXJG0Xb7IUkythnBemFnglXmUZ7qn b8r2fl4+Zh5BPc3veyitU2jl88Fu5f9WDFBMRRKNISZ1ruVHiqqGwHh8OD5FLoAVqjkT BHJ9wpyIRiu0fLc2Lz8FohD1uSpMlp9jAzbDU6PJvi/HPXT12/CLxLjlqrwMiLammAID w9HN5fd6wACiWMBo2aRLoEtopmJazHn2mlWwRtfUrXnwE9o0RGONnREEC1NoUuSDW4YG QSC6ngyI3Vim4qxZ0scn9KlcTYan5wYWACN7kIoYE1CrVApfJ2HkIAUCN1aHMZGNljJo J7fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=UqK22JWW; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a20si3859337ejj.269.2020.04.29.07.43.00; Wed, 29 Apr 2020 07:43:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=UqK22JWW; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726808AbgD2Ome (ORCPT + 99 others); Wed, 29 Apr 2020 10:42:34 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:55344 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726348AbgD2Ome (ORCPT ); Wed, 29 Apr 2020 10:42:34 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 03TEgRqQ101686; Wed, 29 Apr 2020 09:42:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1588171347; bh=ri+/lIeSNOTM3l+FNff6gZorR0Kh5OVSvczQZBkHThk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=UqK22JWWrlA2aOJc7U9UqwD4vGTMHLikpFgdmyFz3FCCi9KBRNMHAq42jzT0H0dRo bJxru1BLo3QM4R2s7QkRrWNjnTx1KDLmRVMw7sZ4zYGE/CMaKWvRA89gosJJjB6SXw Bsc6iWfe0uQZ95dvPhWNNs4w8rbgt7A4GwqnMJLc= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 03TEgRRr009946; Wed, 29 Apr 2020 09:42:27 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 29 Apr 2020 09:42:27 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 29 Apr 2020 09:42:27 -0500 Received: from sokoban.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 03TEgHjQ103561; Wed, 29 Apr 2020 09:42:26 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 6/6] crypto: omap-aes: prevent unregistering algorithms twice Date: Wed, 29 Apr 2020 17:42:05 +0300 Message-ID: <20200429144205.5291-7-t-kristo@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200429144205.5291-1-t-kristo@ti.com> References: <20200429144205.5291-1-t-kristo@ti.com> MIME-Version: 1.0 Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Most of the OMAP family SoCs contain two instances for AES core, which causes the remove callbacks to be also done twice when driver is removed. Fix the algorithm unregister callbacks to take into account the number of algorithms still registered to avoid removing these twice. Signed-off-by: Tero Kristo --- drivers/crypto/omap-aes.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index 824ddf2a66ff..b5aff20c5900 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -1269,13 +1269,17 @@ static int omap_aes_remove(struct platform_device *pdev) spin_unlock(&list_lock); for (i = dd->pdata->algs_info_size - 1; i >= 0; i--) - for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--) + for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--) { crypto_unregister_skcipher( &dd->pdata->algs_info[i].algs_list[j]); + dd->pdata->algs_info[i].registered--; + } - for (i = dd->pdata->aead_algs_info->size - 1; i >= 0; i--) { + for (i = dd->pdata->aead_algs_info->registered - 1; i >= 0; i--) { aalg = &dd->pdata->aead_algs_info->algs_list[i]; crypto_unregister_aead(aalg); + dd->pdata->aead_algs_info->registered--; + } crypto_engine_exit(dd->engine); -- 2.17.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki