Commit 13c6da02 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi: Allocate runtime workqueue before ACPI init 



Since commit

  5894cf57 ("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")

ACPI PRM calls are delegated to a workqueue which runs in a kernel
thread, making it easier to detect and mitigate faulting memory accesses
performed by the firmware.

Rafael reports that such PRM accesses may occur before efisubsys_init()
executes, which is where the workqueue is allocated, leading to NULL
pointer dereferences. Since acpi_init() [which triggers the early PRM
accesses] executes as a subsys_initcall() as well, and has its own
dependencies that may be sensitive to initcall ordering, deferring
acpi_init() is not an option.

So instead, split off the workqueue allocation into its own postcore
initcall, as this is the only missing piece to allow EFI runtime calls
to be made. This ensures that EFI runtime call (including PRM calls) are
accessible to all code running at subsys_initcall() level.

Cc: <stable@vger.kernel.org>
Fixes: 5894cf57 ("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")
Reviewed-by: default avatarRafael J. Wysocki (Intel) <rafael@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 2c340aab

drivers/firmware/efi/efi.c

+16 −12
Original line number Diff line number Diff line
@@ -402,21 +402,11 @@ static void __init efi_debugfs_init(void) 
static inline void efi_debugfs_init(void) {}

#endif



/*

 * We register the efi subsystem with the firmware subsystem and the

 * efivars subsystem with the efi subsystem, if the system was booted with

 * EFI.

 */

static int __init efisubsys_init(void)

static int __init efipostcore_init(void)

{

	int error;



	if (!efi_enabled(EFI_RUNTIME_SERVICES))

		efi.runtime_supported_mask = 0;



	if (!efi_enabled(EFI_BOOT))

		return 0;



	if (efi.runtime_supported_mask) {

		/*

		 * Since we process only one efi_runtime_service() at a time, an
@@ -428,9 +418,23 @@ static int __init efisubsys_init(void) 
			pr_err("Creating efi_rts_wq failed, EFI runtime services disabled.\n");

			clear_bit(EFI_RUNTIME_SERVICES, &efi.flags);

			efi.runtime_supported_mask = 0;

			return 0;

		}

	}

	return 0;

}

postcore_initcall(efipostcore_init);



/*

 * We register the efi subsystem with the firmware subsystem and the

 * efivars subsystem with the efi subsystem, if the system was booted with

 * EFI.

 */

static int __init efisubsys_init(void)

{

	int error;



	if (!efi_enabled(EFI_BOOT))

		return 0;



	if (efi_rt_services_supported(EFI_RT_SUPPORTED_TIME_SERVICES))

		platform_device_register_simple("rtc-efi", 0, NULL, 0);