diff mbox series

[v5,4/5] libstub: Fix compilation warning for rv32

Message ID 20230721074850.310644-5-alexghiti@rivosinc.com
State New
Headers
Series riscv: Introduce KASLR |

Commit Message

Alexandre Ghiti July 21, 2023, 7:48 a.m. UTC 
  Fix the following warning which appears when compiled for rv32 by using
unsigned long type instead of u64.

../drivers/firmware/efi/libstub/efi-stub-helper.c: In function 'efi_kaslr_relocate_kernel':
../drivers/firmware/efi/libstub/efi-stub-helper.c:846:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  846 |                            (u64)_end < EFI_ALLOC_LIMIT) {

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
---
 drivers/firmware/efi/libstub/kaslr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ard Biesheuvel July 21, 2023, 2:42 p.m. UTC | #1 
On Fri, 21 Jul 2023 at 09:52, Alexandre Ghiti <alexghiti@rivosinc.com> wrote:
>
> Fix the following warning which appears when compiled for rv32 by using
> unsigned long type instead of u64.
>
> ../drivers/firmware/efi/libstub/efi-stub-helper.c: In function 'efi_kaslr_relocate_kernel':
> ../drivers/firmware/efi/libstub/efi-stub-helper.c:846:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>   846 |                            (u64)_end < EFI_ALLOC_LIMIT) {
>
> Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>

Acked-by: Ard Biesheuvel <ardb@kernel.org>

For all I care, you can just squash this into the previous patch as well.

> ---
>  drivers/firmware/efi/libstub/kaslr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/kaslr.c b/drivers/firmware/efi/libstub/kaslr.c
> index be0c8ab0982a..afb857329799 100644
> --- a/drivers/firmware/efi/libstub/kaslr.c
> +++ b/drivers/firmware/efi/libstub/kaslr.c
> @@ -130,7 +130,7 @@ efi_status_t efi_kaslr_relocate_kernel(unsigned long *image_addr,
>                 if (!check_image_region(*image_addr, kernel_memsize)) {
>                         efi_err("FIRMWARE BUG: Image BSS overlaps adjacent EFI memory region\n");
>                 } else if (IS_ALIGNED(*image_addr, min_kimg_align) &&
> -                          (u64)_end < EFI_ALLOC_LIMIT) {
> +                          (unsigned long)_end < EFI_ALLOC_LIMIT) {
>                         /*
>                          * Just execute from wherever we were loaded by the
>                          * UEFI PE/COFF loader if the placement is suitable.
> --
> 2.39.2
>
diff mbox series

Patch

diff --git a/drivers/firmware/efi/libstub/kaslr.c b/drivers/firmware/efi/libstub/kaslr.c
index be0c8ab0982a..afb857329799 100644
--- a/drivers/firmware/efi/libstub/kaslr.c
+++ b/drivers/firmware/efi/libstub/kaslr.c
@@ -130,7 +130,7 @@  efi_status_t efi_kaslr_relocate_kernel(unsigned long *image_addr,
 		if (!check_image_region(*image_addr, kernel_memsize)) {
 			efi_err("FIRMWARE BUG: Image BSS overlaps adjacent EFI memory region\n");
 		} else if (IS_ALIGNED(*image_addr, min_kimg_align) &&
-			   (u64)_end < EFI_ALLOC_LIMIT) {
+			   (unsigned long)_end < EFI_ALLOC_LIMIT) {
 			/*
 			 * Just execute from wherever we were loaded by the
 			 * UEFI PE/COFF loader if the placement is suitable.