From: Greg Kroah-Hartman Date: Sun, 9 Mar 2025 08:31:24 +0000 (+0100) Subject: fix up efi patch for 6.6 X-Git-Tag: v6.6.82~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1d8477b9099ef9f8f1c3ae0d3a4f67bfb9c2458;p=thirdparty%2Fkernel%2Fstable-queue.git fix up efi patch for 6.6 --- diff --git a/queue-6.6/efi-don-t-map-the-entire-mokvar-table-to-determine-i.patch b/queue-6.6/efi-don-t-map-the-entire-mokvar-table-to-determine-its-size.patch similarity index 86% rename from queue-6.6/efi-don-t-map-the-entire-mokvar-table-to-determine-i.patch rename to queue-6.6/efi-don-t-map-the-entire-mokvar-table-to-determine-its-size.patch index a538c1e6a1..d8905c193a 100644 --- a/queue-6.6/efi-don-t-map-the-entire-mokvar-table-to-determine-i.patch +++ b/queue-6.6/efi-don-t-map-the-entire-mokvar-table-to-determine-its-size.patch @@ -1,11 +1,11 @@ -From 1b3aad19eac5e8f214c26d12c3fca516d8feae51 Mon Sep 17 00:00:00 2001 -From: Sasha Levin +From 65f4aebb8127708ba668dd938e83b8558abfc5cd Mon Sep 17 00:00:00 2001 +From: Peter Jones Date: Wed, 26 Feb 2025 15:18:39 -0500 Subject: efi: Don't map the entire mokvar table to determine its size From: Peter Jones -[ Upstream commit 2b90e7ace79774a3540ce569e000388f8d22c9e0 ] +commit 2b90e7ace79774a3540ce569e000388f8d22c9e0 upstream. Currently, when validating the mokvar table, we (re)map the entire table on each iteration of the loop, adding space as we discover new entries. @@ -46,24 +46,24 @@ verify it in place. Cc: Signed-off-by: Peter Jones Signed-off-by: Ard Biesheuvel -Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/firmware/efi/mokvar-table.c | 41 +++++++++-------------------- - 1 file changed, 13 insertions(+), 28 deletions(-) + drivers/firmware/efi/mokvar-table.c | 42 +++++++++++------------------------- + 1 file changed, 13 insertions(+), 29 deletions(-) -diff --git a/drivers/firmware/efi/mokvar-table.c b/drivers/firmware/efi/mokvar-table.c -index 5ed0602c2f75f..d865cb1dbaad1 100644 --- a/drivers/firmware/efi/mokvar-table.c +++ b/drivers/firmware/efi/mokvar-table.c -@@ -103,7 +103,6 @@ void __init efi_mokvar_table_init(void) +@@ -103,9 +103,7 @@ void __init efi_mokvar_table_init(void) void *va = NULL; unsigned long cur_offset = 0; unsigned long offset_limit; - unsigned long map_size = 0; unsigned long map_size_needed = 0; - unsigned long size; +- unsigned long size; struct efi_mokvar_table_entry *mokvar_entry; -@@ -134,48 +133,34 @@ void __init efi_mokvar_table_init(void) + int err; + +@@ -134,48 +132,34 @@ void __init efi_mokvar_table_init(void) */ err = -EINVAL; while (cur_offset + sizeof(*mokvar_entry) <= offset_limit) { @@ -125,6 +125,3 @@ index 5ed0602c2f75f..d865cb1dbaad1 100644 if (err) { pr_err("EFI MOKvar config table is not valid\n"); return; --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index d82f032daf..e8d4f1d967 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -1,3 +1,4 @@ +efi-don-t-map-the-entire-mokvar-table-to-determine-its-size.patch drm-i915-xe2lpd-move-d2d-enable-disable.patch drm-i915-ddi-fix-hdmi-port-width-programming-in-ddi_.patch arm64-dts-rockchip-add-rs485-support-on-uart5-of-px3.patch @@ -17,4 +18,3 @@ riscv-prevent-a-bad-reference-count-on-cpu-nodes.patch riscv-cacheinfo-use-of_property_present-for-non-bool.patch risc-v-enable-cbo.zero-in-usermode.patch riscv-signal-fix-signal_minsigstksz.patch -efi-don-t-map-the-entire-mokvar-table-to-determine-i.patch