efi: fix memory calculation overflow on 32-bit systems
Hi,
There are Cubox-i machines out there with nearly 4 GiB of RAM. The RAM starts at 0x10000000 with a size of 0xf0000000. Thus the end of RAM is at 0x100000000. This overflows a 32-bit integer, which should be fine since in the EFI memory code the variables used are all 64-bit with a fixed size. Unfortunately EFI_PAGE_MASK, which is used in the EFI memory code to remove the lower bits, is based on the EFI_PAGE_SIZE macro which, uses 1UL with a shift. This means the resulting mask is UL, which is only 32-bit on ARMv7. Use ULL to make sure that even on 32-bit platforms we use a 64-bit long mask. Without this there will be no memory available in the EFI memory map and bootefi will fail allocating pages.
Best regards,
Patrick
include/efi.h +1 -1
@@ -190,7 +190,7 @@ enum efi_mem_type {#define EFI_MEM_DESC_VERSION 1#define EFI_PAGE_SHIFT 12 -#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) +#define EFI_PAGE_SIZE (1ULL << EFI_PAGE_SHIFT)#define EFI_PAGE_MASK (EFI_PAGE_SIZE - 1)struct efi_mem_desc {
PATCH 1/1 efi: fix memory calculation overflow on 32-bit systems
Quoted 14 lines · Patrick Wildt
Hi,
There are Cubox-i machines out there with nearly 4 GiB of RAM. The RAM starts at
0x10000000with a size of0xf0000000. Thus the end of RAM is at0x100000000. This overflows a 32-bit integer, which should be fine since in the EFI memory code the variables used are all 64-bit with a fixed size. UnfortunatelyEFI_PAGE_MASK, which is used in the EFI memory code to remove the lower bits, is based on theEFI_PAGE_SIZEmacro which, uses 1UL with a shift. This means the resulting mask is UL, which is only 32-bit on ARMv7. Use ULL to make sure that even on 32-bit platforms we use a 64-bit long mask. Without this there will be no memory available in the EFI memory map and bootefi will fail allocating pages.
Quoted 2 lines
Best regards,
Patrick
We are using & ~EFI_PAGE_MASK in multiplaces for 64bit operations. So it makes sense to use a 64bit value.
Quoted 15 lines
include/efi.h +1
-1@@ -190,7 +190,7 @@ enum efi_mem_type {#define EFI_MEM_DESC_VERSION 1#define EFI_PAGE_SHIFT 12 -#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) +#define EFI_PAGE_SIZE (1ULL << EFI_PAGE_SHIFT)#define EFI_PAGE_MASK (EFI_PAGE_SIZE - 1)struct efi_mem_desc {
Patrick DELAUNAY
Reviewed-byHi Patrick,
Quoted 22 lines
From: U-Boot <[email protected]> On Behalf Of Patrick Wildt
Hi,
There are Cubox-i machines out there with nearly 4 GiB of RAM. The RAM starts at
0x10000000with a size of0xf0000000. Thus the end of RAM is at0x100000000. This overflows a 32-bit integer, which should be fine since in the EFI memory code the variables used are all 64-bit with a fixed size. UnfortunatelyEFI_PAGE_MASK, which is used in the EFI memory code to remove the lower bits, is based on theEFI_PAGE_SIZEmacro which, uses 1UL with a shift. This means the resulting mask is UL, which is only 32-bit on ARMv7. Use ULL to make sure that even on 32-bit platforms we use a 64-bit long mask. Without this there will be no memory available in the EFI memory map and bootefi will fail allocating pages.Best regards,
Patrick
include/efi.h enum efi_mem_type { · line 196
Quoted 8 lines
include/efi.h +1
-1@@ -190,7 +190,7 @@ enum efi_mem_type {#define EFI_MEM_DESC_VERSION 1#define EFI_PAGE_SHIFT 12 -#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT) +#define EFI_PAGE_SIZE (1ULL << EFI_PAGE_SHIFT)#define EFI_PAGE_MASK (EFI_PAGE_SIZE - 1)struct efi_mem_desc {
Same issue for stm32mp157c-ev1 board (32bits platform with 1GB at 0xC0000000).
Patched tested on v2019.04 and my issue is solved and it is a better approach that my patch http://patchwork.ozlabs.org/patch/1083262/
So I will abandon my path and
Quoted 4 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot
Regards
Patrick