EFI fix for v5.5
Ard Biesheuvel
maintainerThe following changes since commit b418d660bb9798d2249ac6a46c844389ef50b6a5:
efi/earlycon: Remap entire framebuffer after page initialization (2019-12-08 12:42:19 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-urgent
for you to fetch changes up to e943a5491f445c0d39ec69e897eb1fd180d09ffd:
efi: don't attempt to map RCI2 config table if it doesn't exist (2019-12-10 10:08:24 +0100)
----------------------------------------------------------------
Another EFI fix for the v5.5 cycle:
- Avoid dereferencing the RCI2 configuration table address if it hasn't been assigned.
----------------------------------------------------------------
Ard Biesheuvel (1):
efi: don't attempt to map RCI2 config table if it doesn't exist
drivers/firmware/efi/rci2-table.c | 3 +++ 1 file changed, 3 insertions(+)
Ard Biesheuvel
maintainerPATCH 1/1 efi: don't attempt to map RCI2 config table if it doesn't exist
Commit 1c5fecb61255aa12
"efi: Export Runtime Configuration Interface table to sysfs"
added support for a Dell specific UEFI configuration table, but failed to take into account that mapping the table should not be attempted unless the table actually exists. If it doesn't exist, the code usually fails silently unless pr_debug() prints are enabled. However, on 32-bit PAE x86, the splat below is produced due to the attempt to map the placeholder value EFI_INVALID_TABLE_ADDR which we use for non-existing UEFI configuration tables, and which equals ULONG_MAX.
[ 2.852491] memremap attempted on mixed range 0x00000000ffffffff size: 0x1e [ 2.852501] WARNING: CPU: 1 PID: 1 at kernel/iomem.c:81 memremap+0x1a3/0x1c0 [ 2.852501] Modules linked in: [ 2.852503] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.4.2-smp-mine #1 [ 2.852504] Hardware name: Hewlett-Packard HP Z400 Workstation/0B4Ch, BIOS 786G3 v03.61 03/05/2018 [ 2.852505] EIP: memremap+0x1a3/0x1c0 ... [ 2.852507] EAX: 0000003f EBX: 0000001e ECX: c5225bc0 EDX: 00000001 [ 2.852507] ESI: 01000200 EDI: 00000000 EBP: ee551f0c ESP: ee551eec [ 2.852508] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010296 [ 2.852509] CR0: 80050033 CR2: 00000000 CR3: 0520c000 CR4: 000006f0 [ 2.852509] Call Trace: [ 2.852513] ? map_properties+0x473/0x473 [ 2.852515] ? efi_rci2_sysfs_init+0x2c/0x154 [ 2.852516] ? map_properties+0x473/0x473 [ 2.852517] ? do_one_initcall+0x49/0x1d4 [ 2.852519] ? parse_args+0x1e8/0x2a0 [ 2.852521] ? do_early_param+0x7a/0x7a [ 2.852522] ? kernel_init_freeable+0x139/0x1c2 [ 2.852525] ? rest_init+0x8e/0x8e [ 2.852526] ? kernel_init+0xd/0xf2 [ 2.852529] ? ret_from_fork+0x2e/0x38 [ 2.852530] ---[ end trace 5c4c3f26439c3728 ]---
Fix this by checking whether the table exists before attempting to map it.
--- drivers/firmware/efi/rci2-table.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/firmware/efi/rci2-table.c +3 -0
@@ -81,6 +81,9 @@ static int __init efi_rci2_sysfs_init(void)struct kobject *tables_kobj;int ret = -ENOMEM ; +if (rci2_table_phys ==EFI_INVALID_TABLE_ADDR ) +return 0 ; + rci2_base =memremap (rci2_table_phys,sizeof (struct rci2_table_global_hdr ),MEMREMAP_WB );
Signature · 1 line
2.17.1
[tip: efi/urgent] efi: Don't attempt to map RCI2 config table if it doesn't exist
The following commit has been merged into the efi/urgent branch of tip:
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: a470552ee8965da0fe6fd4df0aa39c4cda652c7c Gitweb: https://git.kernel.org/tip/a470552ee8965da0fe6fd4df0aa39c4cda652c7c Author: Ard Biesheuvel <[email protected]> AuthorDate: Tue, 10 Dec 2019 10:09:45 +01:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 10 Dec 2019 12:13:02 +01:00
efi: Don't attempt to map RCI2 config table if it doesn't exist
Commit:
1c5fecb61255aa12 ("efi: Export Runtime Configuration Interface table to sysfs")
... added support for a Dell specific UEFI configuration table, but failed to take into account that mapping the table should not be attempted unless the table actually exists. If it doesn't exist, the code usually fails silently unless pr_debug() prints are enabled. However, on 32-bit PAE x86, the splat below is produced due to the attempt to map the placeholder value EFI_INVALID_TABLE_ADDR which we use for non-existing UEFI configuration tables, and which equals ULONG_MAX.
memremap attempted on mixed range 0x00000000ffffffff size: 0x1e
WARNING: CPU: 1 PID: 1 at kernel/iomem.c:81 memremap+0x1a3/0x1c0
Modules linked in:
CPU: 1 PID: 1 Comm: swapper/0 Not tainted 5.4.2-smp-mine #1
Hardware name: Hewlett-Packard HP Z400 Workstation/0B4Ch, BIOS 786G3 v03.61 03/05/2018
EIP: memremap+0x1a3/0x1c0
...
Call Trace:
? map_properties+0x473/0x473
? efi_rci2_sysfs_init+0x2c/0x154
? map_properties+0x473/0x473
? do_one_initcall+0x49/0x1d4
? parse_args+0x1e8/0x2a0
? do_early_param+0x7a/0x7a
? kernel_init_freeable+0x139/0x1c2
? rest_init+0x8e/0x8e
? kernel_init+0xd/0xf2
? ret_from_fork+0x2e/0x38Fix this by checking whether the table exists before attempting to map it.
--- drivers/firmware/efi/rci2-table.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/firmware/efi/rci2-table.c +3 -0
@@ -81,6 +81,9 @@ static int __init efi_rci2_sysfs_init(void)struct kobject *tables_kobj;int ret = -ENOMEM ; +if (rci2_table_phys ==EFI_INVALID_TABLE_ADDR ) +return 0 ; + rci2_base =memremap (rci2_table_phys,sizeof (struct rci2_table_global_hdr ),MEMREMAP_WB );