From patchwork Tue Aug 7 08:00:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Niestroj X-Patchwork-Id: 10558381 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 77B6314E2 for ; Tue, 7 Aug 2018 08:45:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64D9829BBF for ; Tue, 7 Aug 2018 08:45:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58B7129BC4; Tue, 7 Aug 2018 08:45:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C94C829BBF for ; Tue, 7 Aug 2018 08:45:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727533AbeHGK6z (ORCPT ); Tue, 7 Aug 2018 06:58:55 -0400 Received: from smtp.megiteam.pl ([31.186.83.105]:52560 "EHLO smtp.megiteam.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727319AbeHGK6z (ORCPT ); Tue, 7 Aug 2018 06:58:55 -0400 Received: from [95.143.241.142] (helo=localhost.localdomain) by smtp.megiteam.pl with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fmwuz-0003oR-Nq; Tue, 07 Aug 2018 10:00:38 +0200 From: Marcin Niestroj To: =?utf-8?q?Horia_Geant=C4=83?= Cc: Aymen Sghaier , Herbert Xu , "David S . Miller" , linux-crypto@vger.kernel.org, Marcin Niestroj Subject: [RESEND PATCH 1/2] crypto: caam/jr - Fix race by statically initializing global data Date: Tue, 7 Aug 2018 10:00:25 +0200 Message-Id: <20180807080026.17039-2-m.niestroj@grinn-global.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180807080026.17039-1-m.niestroj@grinn-global.com> References: <20180807080026.17039-1-m.niestroj@grinn-global.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is a race condition, when driver is not initialized yet (jr_driver_init() was not called yet), but another kernel code calls caam_jr_alloc(). This results in warnings about uninitialized lock and NULL pointer dereference error. Fix that by statically initializing global driver data, so caam_jr_alloc() always works on initialized variables. Signed-off-by: Marcin Niestroj --- drivers/crypto/caam/jr.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index f4f258075b89..1352a4875d5a 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -21,7 +21,10 @@ struct jr_driver_data { spinlock_t jr_alloc_lock; /* jr_list lock */ } ____cacheline_aligned; -static struct jr_driver_data driver_data; +static struct jr_driver_data driver_data = { + .jr_list = LIST_HEAD_INIT(driver_data.jr_list), + .jr_alloc_lock = __SPIN_LOCK_UNLOCKED(driver_data.jr_alloc_lock), +}; static int caam_reset_hw_jr(struct device *dev) { @@ -561,20 +564,7 @@ static struct platform_driver caam_jr_driver = { .remove = caam_jr_remove, }; -static int __init jr_driver_init(void) -{ - spin_lock_init(&driver_data.jr_alloc_lock); - INIT_LIST_HEAD(&driver_data.jr_list); - return platform_driver_register(&caam_jr_driver); -} - -static void __exit jr_driver_exit(void) -{ - platform_driver_unregister(&caam_jr_driver); -} - -module_init(jr_driver_init); -module_exit(jr_driver_exit); +module_platform_driver(caam_jr_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("FSL CAAM JR request backend");