| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <tip-41dd9d30a0994a138d3d3b5a2e1e46bd1aa38ea2@git.kernel.org>
Date: Mon, 4 Feb 2019 00:47:29 -0800
From: tip-bot for Ard Biesheuvel <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: sai.praneeth.prakhya@...el.com, torvalds@...ux-foundation.org,
ard.biesheuvel@...aro.org, peterz@...radead.org, hpa@...or.com,
agraf@...e.de, takahiro.akashi@...aro.org, bp@...en8.de,
linux-kernel@...r.kernel.org, jhugo@...eaurora.org,
tglx@...utronix.de, lee.jones@...aro.org, leif.lindholm@...aro.org,
pjones@...hat.com, matt@...eblueprint.co.uk, mingo@...nel.org,
bjorn.andersson@...aro.org, xypron.glpk@....de
Subject: [tip:efi/core] acpi/bgrt: Parse BGRT to obtain BMP address before
it gets clobbered
Commit-ID: 41dd9d30a0994a138d3d3b5a2e1e46bd1aa38ea2
Gitweb: https://git.kernel.org/tip/41dd9d30a0994a138d3d3b5a2e1e46bd1aa38ea2
Author: Ard Biesheuvel <ard.biesheuvel@...aro.org>
AuthorDate: Sat, 2 Feb 2019 10:41:19 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 4 Feb 2019 08:27:31 +0100
acpi/bgrt: Parse BGRT to obtain BMP address before it gets clobbered
The bitmap left in the framebuffer by the firmware is described by an
ACPI table called "BGRT", which describes the size, pixel format and
the address of a BMP image in memory. While the BGRT ACPI table is
guaranteed to reside in a "ACPI reclaim" memory region, which is
never touched by Linux, the BMP image, however, typically resides
in EFI Boot Services Memory, which may have been overwritten by the
time the BGRT discovery routine runs.
So instead, drop the handling from the ACPI init code, and call the
BGRT parsing code immediately after going over the EFI configuration
table array, at which time no memory has been touched yet except for
the .data/.bss regions covered by the static kernel image.
Unfortunately, this involves a non-trivial amount of ACPI entry
point and root table parsing, but we cannot rely on the normal
ACPI infrastructure yet this early in the boot.
Also note that we cannot take the 'acpi_disabled' global variable
into account, since it may not have assumed the correct value yet
(on arm64, the default value is '1' which is overridden to '0' if
no DT description has been made available by the firmware).
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Cc: AKASHI Takahiro <takahiro.akashi@...aro.org>
Cc: Alexander Graf <agraf@...e.de>
Cc: Bjorn Andersson <bjorn.andersson@...aro.org>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Heinrich Schuchardt <xypron.glpk@....de>
Cc: Jeffrey Hugo <jhugo@...eaurora.org>
Cc: Lee Jones <lee.jones@...aro.org>
Cc: Leif Lindholm <leif.lindholm@...aro.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Matt Fleming <matt@...eblueprint.co.uk>
Cc: Peter Jones <pjones@...hat.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Sai Praneeth Prakhya <sai.praneeth.prakhya@...el.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-efi@...r.kernel.org
Link: http://lkml.kernel.org/r/20190202094119.13230-11-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/arm64/kernel/acpi.c | 2 -
arch/x86/kernel/acpi/boot.c | 2 -
drivers/acpi/bgrt.c | 6 ---
drivers/firmware/efi/efi-bgrt.c | 84 +++++++++++++++++++++++++++++++++++++----
drivers/firmware/efi/efi.c | 13 +++++++
include/linux/efi-bgrt.h | 4 +-
6 files changed, 92 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 44e3c351e1ea..7429a811f76d 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -230,8 +230,6 @@ done:
early_init_dt_scan_chosen_stdout();
} else {
acpi_parse_spcr(earlycon_acpi_spcr_enable, true);
- if (IS_ENABLED(CONFIG_ACPI_BGRT))
- acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);
}
}
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 2624de16cd7a..2d3535b62752 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1633,8 +1633,6 @@ int __init acpi_boot_init(void)
acpi_process_madt();
acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);
- if (IS_ENABLED(CONFIG_ACPI_BGRT))
- acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);
if (!acpi_noirq)
x86_init.pci.init = pci_acpi_init;
diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
index 75af78361ce5..048413e06898 100644
--- a/drivers/acpi/bgrt.c
+++ b/drivers/acpi/bgrt.c
@@ -81,12 +81,6 @@ static const struct attribute_group bgrt_attribute_group = {
.bin_attrs = bgrt_bin_attributes,
};
-int __init acpi_parse_bgrt(struct acpi_table_header *table)
-{
- efi_bgrt_init(table);
- return 0;
-}
-
static int __init bgrt_init(void)
{
int ret;
diff --git a/drivers/firmware/efi/efi-bgrt.c b/drivers/firmware/efi/efi-bgrt.c
index a2384184a7de..9c50d453b143 100644
--- a/drivers/firmware/efi/efi-bgrt.c
+++ b/drivers/firmware/efi/efi-bgrt.c
@@ -24,24 +24,94 @@ struct bmp_header {
u32 size;
} __packed;
-void __init efi_bgrt_init(struct acpi_table_header *table)
+void __init efi_bgrt_init(unsigned long rsdp_phys)
{
void *image;
struct bmp_header bmp_header;
struct acpi_table_bgrt *bgrt = &bgrt_tab;
+ struct acpi_table_bgrt *table = NULL;
+ struct acpi_table_rsdp *rsdp;
+ struct acpi_table_header *hdr;
+ u64 xsdt_phys = 0;
+ u32 rsdt_phys = 0;
+ size_t len;
- if (acpi_disabled)
+ if (!efi_enabled(EFI_MEMMAP))
return;
- if (!efi_enabled(EFI_MEMMAP))
+ /* map the root pointer table to find the xsdt/rsdt values */
+ rsdp = early_memremap_ro(rsdp_phys, sizeof(*rsdp));
+ if (rsdp) {
+ if (ACPI_VALIDATE_RSDP_SIG(rsdp->signature)) {
+ xsdt_phys = rsdp->xsdt_physical_address;
+ rsdt_phys = rsdp->rsdt_physical_address;
+ }
+ early_memunmap(rsdp, sizeof(*rsdp));
+ }
+
+ if (WARN_ON(!xsdt_phys && !rsdt_phys))
return;
- if (table->length < sizeof(bgrt_tab)) {
- pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n",
- table->length, sizeof(bgrt_tab));
+ /* obtain the length of whichever table we will be using */
+ hdr = early_memremap_ro(xsdt_phys ?: rsdt_phys, sizeof(*hdr));
+ if (WARN_ON(!hdr))
+ return;
+ len = hdr->length;
+ early_memunmap(hdr, sizeof(*hdr));
+
+ /* remap with the correct length */
+ hdr = early_memremap_ro(xsdt_phys ?: rsdt_phys, len);
+ if (WARN_ON(!hdr))
+ return;
+
+ if (xsdt_phys) {
+ struct acpi_table_xsdt *xsdt = (void *)hdr;
+ int i;
+
+ for (i = 0; i < (len - sizeof(*hdr)) / sizeof(u64); i++) {
+ table = early_memremap_ro(xsdt->table_offset_entry[i],
+ sizeof(*table));
+ if (WARN_ON(!table))
+ break;
+
+ if (ACPI_COMPARE_NAME(table->header.signature,
+ ACPI_SIG_BGRT))
+ break;
+ early_memunmap(table, sizeof(*table));
+ table = NULL;
+ }
+ } else if (rsdt_phys) {
+ struct acpi_table_rsdt *rsdt = (void *)hdr;
+ int i;
+
+ for (i = 0; i < (len - sizeof(*hdr)) / sizeof(u32); i++) {
+ table = early_memremap_ro(rsdt->table_offset_entry[i],
+ sizeof(*table));
+ if (WARN_ON(!table))
+ break;
+
+ if (ACPI_COMPARE_NAME(table->header.signature,
+ ACPI_SIG_BGRT))
+ break;
+ early_memunmap(table, sizeof(*table));
+ table = NULL;
+ }
+ }
+ early_memunmap(hdr, len);
+
+ if (!table)
return;
+
+ len = table->header.length;
+ memcpy(bgrt, table, min(len, sizeof(bgrt_tab)));
+ early_memunmap(table, sizeof(*table));
+
+ if (len < sizeof(bgrt_tab)) {
+ pr_notice("Ignoring BGRT: invalid length %zu (expected %zu)\n",
+ len, sizeof(bgrt_tab));
+ goto out;
}
- *bgrt = *(struct acpi_table_bgrt *)table;
+
if (bgrt->version != 1) {
pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n",
bgrt->version);
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 4c46ff6f2242..e5ef5c0eacc1 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/device.h>
#include <linux/efi.h>
+#include <linux/efi-bgrt.h>
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/io.h>
@@ -592,6 +593,18 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
early_memunmap(tbl, sizeof(*tbl));
}
+
+ /*
+ * We need to parse the BGRT table (which is an ACPI table not a UEFI
+ * configuration table) by hand and figure out where the bitmap it
+ * describes lives in memory so we can reserve it early on. Otherwise,
+ * it may be clobbered by the time we get to it during the ordinary ACPI
+ * table init sequence.
+ */
+ if (IS_ENABLED(CONFIG_ACPI_BGRT) &&
+ efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+ efi_bgrt_init(efi.acpi20);
+
return 0;
}
diff --git a/include/linux/efi-bgrt.h b/include/linux/efi-bgrt.h
index e6cd51005633..528ea62d99ec 100644
--- a/include/linux/efi-bgrt.h
+++ b/include/linux/efi-bgrt.h
@@ -6,7 +6,7 @@
#ifdef CONFIG_ACPI_BGRT
-void efi_bgrt_init(struct acpi_table_header *table);
+void efi_bgrt_init(unsigned long rsdp_phys);
int __init acpi_parse_bgrt(struct acpi_table_header *table);
/* The BGRT data itself; only valid if bgrt_image != NULL. */
@@ -15,7 +15,7 @@ extern struct acpi_table_bgrt bgrt_tab;
#else /* !CONFIG_ACPI_BGRT */
-static inline void efi_bgrt_init(struct acpi_table_header *table) {}
+static inline void efi_bgrt_init(unsigned long rsdp_phys) {}
static inline int __init acpi_parse_bgrt(struct acpi_table_header *table)
{
return 0;
Powered by blists - more mailing lists