From: Greg Kroah-Hartman Date: Tue, 12 Nov 2024 08:38:30 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v5.15.172~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bb7de5eee35751fcb139f9470bfde54bfc4d66e;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch --- diff --git a/queue-5.15/acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch b/queue-5.15/acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch new file mode 100644 index 00000000000..a97f1857abf --- /dev/null +++ b/queue-5.15/acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch @@ -0,0 +1,57 @@ +From 3d1c651272cf1df8aac7d9b6d92d836d27bed50f Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Thu, 24 Oct 2024 11:07:15 +0300 +Subject: ACPI: PRM: Clean up guid type in struct prm_handler_info + +From: Dan Carpenter + +commit 3d1c651272cf1df8aac7d9b6d92d836d27bed50f upstream. + +Clang 19 prints a warning when we pass &th->guid to efi_pa_va_lookup(): + +drivers/acpi/prmt.c:156:29: error: passing 1-byte aligned argument to +4-byte aligned parameter 1 of 'efi_pa_va_lookup' may result in an +unaligned pointer access [-Werror,-Walign-mismatch] + 156 | (void *)efi_pa_va_lookup(&th->guid, handler_info->handler_address); + | ^ + +The problem is that efi_pa_va_lookup() takes a efi_guid_t and &th->guid +is a regular guid_t. The difference between the two types is the +alignment. efi_guid_t is a typedef. + + typedef guid_t efi_guid_t __aligned(__alignof__(u32)); + +It's possible that this a bug in Clang 19. Even though the alignment of +&th->guid is not explicitly specified, it will still end up being aligned +at 4 or 8 bytes. + +Anyway, as Ard points out, it's cleaner to change guid to efi_guid_t type +and that also makes the warning go away. + +Fixes: 088984c8d54c ("ACPI: PRM: Find EFI_MEMORY_RUNTIME block for PRM handler and context") +Reported-by: Linux Kernel Functional Testing +Suggested-by: Ard Biesheuvel +Signed-off-by: Dan Carpenter +Tested-by: Paul E. McKenney +Acked-by: Ard Biesheuvel +Link: https://patch.msgid.link/3777d71b-9e19-45f4-be4e-17bf4fa7a834@stanley.mountain +[ rjw: Subject edit ] +Signed-off-by: Rafael J. Wysocki +[nathan: Fix conflicts due to lack of e38abdab441c] +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/prmt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/prmt.c ++++ b/drivers/acpi/prmt.c +@@ -52,7 +52,7 @@ struct prm_context_buffer { + static LIST_HEAD(prm_module_list); + + struct prm_handler_info { +- guid_t guid; ++ efi_guid_t guid; + void *handler_addr; + u64 static_data_buffer_addr; + u64 acpi_param_buffer_addr; diff --git a/queue-5.15/series b/queue-5.15/series index e596278d943..99acc3e8207 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -70,3 +70,4 @@ ocfs2-remove-entry-once-instead-of-null-ptr-dereference-in-ocfs2_xa_remove.patch ucounts-fix-counter-leak-in-inc_rlimit_get_ucounts.patch alsa-usb-audio-support-jack-detection-on-dell-dock.patch alsa-usb-audio-add-quirks-for-dell-wd19-dock.patch +acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch