From mboxrd@z Thu Jan 1 00:00:00 1970 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 F3132C3DA78 for ; Sat, 14 Jan 2023 09:51:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230150AbjANJvM (ORCPT ); Sat, 14 Jan 2023 04:51:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230149AbjANJvK (ORCPT ); Sat, 14 Jan 2023 04:51:10 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 319D6A2 for ; Sat, 14 Jan 2023 01:51:10 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DC61AB80765 for ; Sat, 14 Jan 2023 09:51:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFE8AC433EF; Sat, 14 Jan 2023 09:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673689867; bh=m2y8UanX6a1EMQOf9hTpBBKC4MHJixrEAuhDOJPt8Dw=; h=Subject:To:Cc:From:Date:From; b=WOropF5N+tsQPS7XUqCrLZ6CZdGGHGqGajacT7nfMwLQSIjlHiqi1pvaOWs8M1u6/ tNiUluhH4ijgSD+eegigWtUQxaud0Oxv95sfvoWJJCj9BIQvAFQe3JiffkV9jiTHpP zZPXfr0x5RMuO7oTAbxMXiSXceRgMvhmTJf9HgTo= Subject: FAILED: patch "[PATCH] efi: fix NULL-deref in init error path" failed to apply to 5.4-stable tree To: johan+linaro@kernel.org, ardb@kernel.org, liheng40@huawei.com Cc: From: Date: Sat, 14 Jan 2023 10:50:46 +0100 Message-ID: <16736898461573@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Possible dependencies: 703c13fe3c9a ("efi: fix NULL-deref in init error path") 1fff234de2b6 ("efi: x86: Move EFI runtime map sysfs code to arch/x86") 8dfac4d8ad27 ("efi: runtime-maps: Clarify purpose and enable by default for kexec") 4059ba656ce5 ("efi: memmap: Move EFI fake memmap support into x86 arch tree") d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support") 25519d683442 ("ima: generalize x86/EFI arch glue for other EFI architectures") 88e9a5b7965c ("efi/fake_mem: arrange for a resource entry per efi_fake_mem instance") 4d0a4388ccdd ("Merge branch 'efi/urgent' into efi/core, to pick up fixes") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 703c13fe3c9af557d312f5895ed6a5fda2711104 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Mon, 19 Dec 2022 10:10:04 +0100 Subject: [PATCH] efi: fix NULL-deref in init error path In cases where runtime services are not supported or have been disabled, the runtime services workqueue will never have been allocated. Do not try to destroy the workqueue unconditionally in the unlikely event that EFI initialisation fails to avoid dereferencing a NULL pointer. Fixes: 98086df8b70c ("efi: add missed destroy_workqueue when efisubsys_init fails") Cc: stable@vger.kernel.org Cc: Li Heng Signed-off-by: Johan Hovold Signed-off-by: Ard Biesheuvel diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 09716eebe8ac..a2b0cbc8741c 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -394,8 +394,8 @@ 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; + error = -ENOMEM; + goto err_destroy_wq; } if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE | @@ -443,7 +443,10 @@ static int __init efisubsys_init(void) err_put: kobject_put(efi_kobj); efi_kobj = NULL; - destroy_workqueue(efi_rts_wq); +err_destroy_wq: + if (efi_rts_wq) + destroy_workqueue(efi_rts_wq); + return error; }