Commit f740aaf3 authored by Dan Carpenter's avatar Dan Carpenter Committed by Xiangwei Li
Browse files

ACPI: PRM: Clean up guid type in struct prm_handler_info

mainline inclusion
from mainline-v6.12-rc5
commit 3d1c651272cf1df8aac7d9b6d92d836d27bed50f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB2SU5
CVE: CVE-2024-50141

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3d1c651272cf1df8aac7d9b6d92d836d27bed50f



-------------------------------------

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: default avatarLinux Kernel Functional Testing <lkft@linaro.org>
Suggested-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Tested-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://patch.msgid.link/3777d71b-9e19-45f4-be4e-17bf4fa7a834@stanley.mountain


[ rjw: Subject edit ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>

Conflicts:
	drivers/acpi/prmt.ci
[context conflict]
Signed-off-by: default avatarXiangwei Li <liwei728@huawei.com>
parent b8d0c750
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;