From patchwork Mon Aug 24 08:31:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 265122 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=-10.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 618F8C433E3 for ; Mon, 24 Aug 2020 08:57:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 363902072D for ; Mon, 24 Aug 2020 08:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598259460; bh=ImpPFBJmwyJzt8S4M4/A8Dv82hlFhhtkULjLLR2O+Yw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MEe8rQ/+l0jx3Gnsl6/Wyymc/7bUkxLzfQl7PfP9ov6fDzRswY1IljZMlNihVwinN lzDDYdgqvggk3N44tI3x8T8g3H4IGe/etIQZ8Rlfypqcgukbfir8ubh2QK258Wknlq kk8aEavbHO/OSvcOEmeeCAdU8zJQ9VDlhogjrl7Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730694AbgHXI5i (ORCPT ); Mon, 24 Aug 2020 04:57:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:44810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730691AbgHXI5g (ORCPT ); Mon, 24 Aug 2020 04:57:36 -0400 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 CE81E207D3; Mon, 24 Aug 2020 08:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598259456; bh=ImpPFBJmwyJzt8S4M4/A8Dv82hlFhhtkULjLLR2O+Yw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1gkpNZSLa9hzjiHEoPh+z5PZyGc0kUdNwn9R/tJx8UXlklP8QP/Msr03HeD2lN5po SgiXP7ReIMjMhm8gpK43O8uVID67dzOhCOWmcb2sl2RyTekw7EHz86Cj7/BGRNEAao 4/jkW9j4IHMfQhXRSvyTV9nYMblJdauMhQUofEGs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Li Heng , Ard Biesheuvel Subject: [PATCH 4.19 66/71] efi: add missed destroy_workqueue when efisubsys_init fails Date: Mon, 24 Aug 2020 10:31:57 +0200 Message-Id: <20200824082359.257365792@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082355.848475917@linuxfoundation.org> References: <20200824082355.848475917@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Li Heng commit 98086df8b70c06234a8f4290c46064e44dafa0ed upstream. destroy_workqueue() should be called to destroy efi_rts_wq when efisubsys_init() init resources fails. Cc: Reported-by: Hulk Robot Signed-off-by: Li Heng Link: https://lore.kernel.org/r/1595229738-10087-1-git-send-email-liheng40@huawei.com Signed-off-by: Ard Biesheuvel Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efi/efi.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -359,6 +359,7 @@ static int __init efisubsys_init(void) efi_kobj = kobject_create_and_add("efi", firmware_kobj); if (!efi_kobj) { pr_err("efi: Firmware registration failed.\n"); + destroy_workqueue(efi_rts_wq); return -ENOMEM; } @@ -395,6 +396,7 @@ err_unregister: generic_ops_unregister(); err_put: kobject_put(efi_kobj); + destroy_workqueue(efi_rts_wq); return error; }