From patchwork Fri Dec 17 15:44:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 525484 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FCBAC433EF for ; Fri, 17 Dec 2021 15:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235087AbhLQPo2 (ORCPT ); Fri, 17 Dec 2021 10:44:28 -0500 Received: from smtp-relay-canonical-0.canonical.com ([185.125.188.120]:44904 "EHLO smtp-relay-canonical-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231386AbhLQPo2 (ORCPT ); Fri, 17 Dec 2021 10:44:28 -0500 Received: from mussarela.. (unknown [179.93.189.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 25AF540037; Fri, 17 Dec 2021 15:44:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639755866; bh=JXQGwMMmUW1nBCI4kpGuICxFe0oVRCxJl7LFrpgK+VU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=uWqBCX2tvlb2lvqEm+eOp8NgBPJacuUGBjusaWrc78j5+VDYQ+6Cgg0NDS3Wb5EAL dMNTR2qN/0+Qf9bNjf1R82KG5pyL8pqu3L1z1SzkGY1e+im0Wx1X7tRdXJhSATb3Bh u6GoeYCA1UQDr8vYT+b+My3g0tlUn4OEBV/YkGfPdcl7ISCVzlNtgSAMjTd9f7DyzK nZ7SXZ5ZZgUvXwuzGPcRlVkh6R1DYB0ZiwrD40YoWlhsulS5tbNSMvq/NGentd+JT6 p84u25SMmn7VizckeUDDx53G3AUzsVce/IvX0Ks0la39J4i3oORo+sODn2/9kYOCSB anxHmDRdFhnAg== From: Thadeu Lima de Souza Cascardo To: openipmi-developer@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, minyard@acm.org, ioanna-maria.alifieraki@canonical.com, minyard@mvista.com, stable@vger.kernel.org Subject: [PATCH 1/2] ipmi: bail out if init_srcu_struct fails Date: Fri, 17 Dec 2021 12:44:09 -0300 Message-Id: <20211217154410.1228673-1-cascardo@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In case, init_srcu_struct fails (because of memory allocation failure), we might proceed with the driver initialization despite srcu_struct not being entirely initialized. Fixes: 913a89f009d9 ("ipmi: Don't initialize anything in the core until something uses it") Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Corey Minyard Cc: stable@vger.kernel.org --- drivers/char/ipmi/ipmi_msghandler.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index c837d5416e0e..84975b21fff2 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -5392,7 +5392,9 @@ static int ipmi_init_msghandler(void) if (initialized) goto out; - init_srcu_struct(&ipmi_interfaces_srcu); + rv = init_srcu_struct(&ipmi_interfaces_srcu); + if (rv) + goto out; timer_setup(&ipmi_timer, ipmi_timeout, 0); mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES); From patchwork Fri Dec 17 15:44:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 527138 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3710DC433EF for ; Fri, 17 Dec 2021 15:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235145AbhLQPog (ORCPT ); Fri, 17 Dec 2021 10:44:36 -0500 Received: from smtp-relay-canonical-0.canonical.com ([185.125.188.120]:44934 "EHLO smtp-relay-canonical-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235158AbhLQPof (ORCPT ); Fri, 17 Dec 2021 10:44:35 -0500 Received: from mussarela.. (unknown [179.93.189.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id CBCBA41846; Fri, 17 Dec 2021 15:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639755874; bh=K4KepFetoeRSfUTPalIOPzR+mpPdGckMTE+MuEeJBEg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QeXiqAqUaxwoXwEDY3haRWNFv6f06HivPJz5bC3eCpqdUTV7XXgBMyR+ctTHZfych QkD/pP2A6sAk5oReAGvNE8wd5jAE4AdaKZmh0nbKUnA2bhBCW4H+Q68QbTwBRi4Cxr 1nBo1tMtHdtDHucC3HaMC4ZFCP5YN8qZXHCPCtdricG84JHXbzeQBhVU/l4THiXqLA 8hVF2qSNUYyVEDoM0rA9XCgcoV2Bq4ezBNU0TXJzNdFmnCu/u8+NjaNtGCBEcex9M+ bccKLPbjEHRx/xc2us3k+cuadym0eQSboeoCuqWYyFe1UKSNgwv+q0/yt/oM56p0Zm DklJl5wfytF/g== From: Thadeu Lima de Souza Cascardo To: openipmi-developer@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, minyard@acm.org, ioanna-maria.alifieraki@canonical.com, minyard@mvista.com, stable@vger.kernel.org Subject: [PATCH 2/2] ipmi: fix initialization when workqueue allocation fails Date: Fri, 17 Dec 2021 12:44:10 -0300 Message-Id: <20211217154410.1228673-2-cascardo@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217154410.1228673-1-cascardo@canonical.com> References: <20211217154410.1228673-1-cascardo@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org If the workqueue allocation fails, the driver is marked as not initialized, and timer and panic_notifier will be left registered. Instead of removing those when workqueue allocation fails, do the workqueue initialization before doing it, and cleanup srcu_struct if it fails. Fixes: 1d49eb91e86e ("ipmi: Move remove_work to dedicated workqueue") Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Corey Minyard Cc: Ioanna Alifieraki Cc: stable@vger.kernel.org --- drivers/char/ipmi/ipmi_msghandler.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 84975b21fff2..266c7bc58dda 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -5396,20 +5396,23 @@ static int ipmi_init_msghandler(void) if (rv) goto out; - timer_setup(&ipmi_timer, ipmi_timeout, 0); - mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES); - - atomic_notifier_chain_register(&panic_notifier_list, &panic_block); - remove_work_wq = create_singlethread_workqueue("ipmi-msghandler-remove-wq"); if (!remove_work_wq) { pr_err("unable to create ipmi-msghandler-remove-wq workqueue"); rv = -ENOMEM; - goto out; + goto out_wq; } + timer_setup(&ipmi_timer, ipmi_timeout, 0); + mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES); + + atomic_notifier_chain_register(&panic_notifier_list, &panic_block); + initialized = true; +out_wq: + if (rv) + cleanup_srcu_struct(&ipmi_interfaces_srcu); out: mutex_unlock(&ipmi_interfaces_mutex); return rv;