[PATCH] efi_loader: use byteshift unaligned access helper

Calling unaligned/access-ok.h version of put_unaligned_le64() causes data abort in arm 32-bit QEMU.
The similar issue also occurs in linux kernel, unaligned/access-ok.h is no longer used in linux kernel[1].
This commit uses the unaligned/be_byteshift.h and unaligned/le_byteshift.h helper instead of unaligned/access-ok.h.
[1]https://lore.kernel.org/all/20210507220813.365382-8-arnd@kernel.org/
Signed-off-by: Masahisa Kojima masahisa.kojima@linaro.org --- lib/efi_loader/efi_tcg2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index cb67006b14..b34d383a7d 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -22,7 +22,8 @@ #include <u-boot/sha1.h> #include <u-boot/sha256.h> #include <u-boot/sha512.h> -#include <linux/unaligned/access_ok.h> +#include <linux/unaligned/be_byteshift.h> +#include <linux/unaligned/le_byteshift.h> #include <linux/unaligned/generic.h> #include <hexdump.h>

On Wed, Nov 03, 2021 at 11:04:09AM +0900, Masahisa Kojima wrote:
Calling unaligned/access-ok.h version of put_unaligned_le64() causes data abort in arm 32-bit QEMU.
The similar issue also occurs in linux kernel, unaligned/access-ok.h is no longer used in linux kernel[1].
This commit uses the unaligned/be_byteshift.h and unaligned/le_byteshift.h helper instead of unaligned/access-ok.h.
[1]https://lore.kernel.org/all/20210507220813.365382-8-arnd@kernel.org/
Signed-off-by: Masahisa Kojima masahisa.kojima@linaro.org
lib/efi_loader/efi_tcg2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index cb67006b14..b34d383a7d 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -22,7 +22,8 @@ #include <u-boot/sha1.h> #include <u-boot/sha256.h> #include <u-boot/sha512.h> -#include <linux/unaligned/access_ok.h> +#include <linux/unaligned/be_byteshift.h> +#include <linux/unaligned/le_byteshift.h> #include <linux/unaligned/generic.h> #include <hexdump.h>
-- 2.17.1
Reviewed-by: Ilias Apalodimas ilias.apalodimas@linaro.org
participants (2)
-
Ilias Apalodimas
-
Masahisa Kojima