Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp975762pxa; Sat, 22 Aug 2020 06:40:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGono05cK7jnYkRho/NdSem1MVu4SGZha7WKJAPJiKqswlcdXJfFbveZ2NlszDMqu20JrH X-Received: by 2002:a50:9358:: with SMTP id n24mr7412144eda.7.1598103637172; Sat, 22 Aug 2020 06:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598103637; cv=none; d=google.com; s=arc-20160816; b=Dfw8qslO9HCZK7B7WQbDeC31mN/X8lZytOjQeMevGEZHd7Ya1yyJnUuKoGM7Y59LMT DfSRu+Oa296mMJxCmHqtiUr0g65ed1byCLs6cdJ0muix6UvF32VGmDE+LQ9A8Y7KicTR jB9e7N6VEPjHcp2dbsAHj8f1WbsVW6dBE3p9NAzk4aKxh/cvVoQDKhZxLgxzkG8G7PAM N6udwv/H4BfQBbZFCAe4W952r+RXutHv0GjBhqc3ur2vZKwnrzOKnyNF8oSVbnTh4riV mYXQ/UG5gCtgNsbSs3d6Y6lvwO+yueKG8KiNJ43pQlwB/Djho/v1b9O3xA4FF5nmdnuC e7lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:dkim-signature :dkim-signature:date; bh=M6HkVMU3f6JIQIoXgMrXSqlEbU5+ibf0CxupnWEepw4=; b=Sbce8uoKKoDlzn0cAEqbNo+CP8xgHBnwWcvKic6K+qTGztRIyRzAULfbkR36KkshPn CZinEy7V1LZAcOzsWAivsje/bKo4I6/n3tPstVsT2v3M5qsG71M1ob1g0lu+KZtdAX0d pLF/jeQX+RcXpKjcaGnN3CwRRKz/cBQ+Ng3e1rIOD7dGJMY+WmMbbCcoNmixFqAHml1f ZEDR0M8Il1DOkjn0XoU76x/RpYjk8oC76SyXNMhHAeG1kYMiAxsWAW4bpSDocBJmlqoq 2EL1NSlDKqak0kTKjp1As3AvFNYdor2E/rl0pR+BiiXXfn8pK5zfUGBg90DuRnziGWZa BAyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=yBhZ7LFz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=mnabc2eT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lj14si2979984ejb.503.2020.08.22.06.40.13; Sat, 22 Aug 2020 06:40:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=yBhZ7LFz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=mnabc2eT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728141AbgHVNjU (ORCPT + 99 others); Sat, 22 Aug 2020 09:39:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728101AbgHVNjD (ORCPT ); Sat, 22 Aug 2020 09:39:03 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58967C061573; Sat, 22 Aug 2020 06:39:03 -0700 (PDT) Date: Sat, 22 Aug 2020 13:39:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1598103541; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M6HkVMU3f6JIQIoXgMrXSqlEbU5+ibf0CxupnWEepw4=; b=yBhZ7LFzZTIxJ0amQuwgc78KgK997t4WqE7vTqwd02MsP9eCVPX400E0n0CiOmLxTwMnGE 8KqDDnpEPTkSCN9T8ogu3O5DWcIhXt6WBh1/5sNGfMConV8c4KYRcD1rHsiqJO42pIHP3x vsPV2I465ezpkRFKKT2DLrS7Yj9Y8xuATxH9Cxmf80OFi3OEE5eIIc93InugePAuGw9yba CkNDzAPR6ULU1vbnO8YeL/Zf/5NlMXO/4TJINtjkstChg3UOPx0CO1kPske9RjXwpzEiwU w34tpY2Byrw1+HU8SVMbJzKidiJEBPswgkjBFnbDNHpjnQlCHrLplgRkl+UaXg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1598103541; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M6HkVMU3f6JIQIoXgMrXSqlEbU5+ibf0CxupnWEepw4=; b=mnabc2eT61/wLQqzLXhfXtfKxeiLFMp8g5SiAIVIg//C2URVxNnHBUqaNZ1pL07ljqMLCe /7OMwG5tFh7dmyCA== From: "tip-bot2 for Li Heng" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: efi/urgent] efi: add missed destroy_workqueue when efisubsys_init fails Cc: , Hulk Robot , Li Heng , Ard Biesheuvel , x86 , LKML In-Reply-To: <1595229738-10087-1-git-send-email-liheng40@huawei.com> References: <1595229738-10087-1-git-send-email-liheng40@huawei.com> MIME-Version: 1.0 Message-ID: <159810354080.3192.12090747441096902319.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the efi/urgent branch of tip: Commit-ID: 98086df8b70c06234a8f4290c46064e44dafa0ed Gitweb: https://git.kernel.org/tip/98086df8b70c06234a8f4290c46064e44dafa0ed Author: Li Heng AuthorDate: Mon, 20 Jul 2020 15:22:18 +08:00 Committer: Ard Biesheuvel CommitterDate: Thu, 20 Aug 2020 11:18:45 +02:00 efi: add missed destroy_workqueue when efisubsys_init fails 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 --- drivers/firmware/efi/efi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index fdd1db0..3aa07c3 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -381,6 +381,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; } @@ -424,6 +425,7 @@ err_unregister: generic_ops_unregister(); err_put: kobject_put(efi_kobj); + destroy_workqueue(efi_rts_wq); return error; }