[PATCH] Fix CopyMem() Wdiscarded-qualifiers

['Storm, Christian' via EFI Boot Guard]

From: Christian Storm <christian.st...@siemens.com>

For gnu-efi < 3.0.17, efilib.h reads
    VOID CopyMem (
        IN VOID         *Dest,
        IN CONST VOID   *Src,
        IN UINTN        len
    )
while for gnu-efi >= 3.0.17, it reads
    VOID EFIAPI CopyMem (
        IN VOID     *Dest,
        IN VOID     *Src,
        IN UINTN    len
    )
due to gnu-efi's commit deb8a7f.

Signed-off-by: Christian Storm <christian.st...@siemens.com>
---
 kernel-stub/fdt.c    | 2 +-
 kernel-stub/initrd.c | 2 +-
 kernel-stub/main.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-stub/fdt.c b/kernel-stub/fdt.c
index e2174af..84cf25d 100644
--- a/kernel-stub/fdt.c
+++ b/kernel-stub/fdt.c
@@ -166,7 +166,7 @@ static EFI_STATUS clone_fdt(const VOID *fdt, UINTN size,
                error(L"Error allocating device tree buffer", status);
                return status;
        }
-       CopyMem((VOID *)(uintptr_t)*fdt_buffer, fdt,
+       CopyMem((VOID *)(uintptr_t)*fdt_buffer, (VOID*)fdt,
                BE32_TO_HOST(header->TotalSize));
        return EFI_SUCCESS;
 }
diff --git a/kernel-stub/initrd.c b/kernel-stub/initrd.c
index 342bf2b..e84ee77 100644
--- a/kernel-stub/initrd.c
+++ b/kernel-stub/initrd.c
@@ -80,7 +80,7 @@ static EFIAPI EFI_STATUS 
initrd_load_file(EFI_LOAD_FILE_PROTOCOL *this,
                return EFI_BUFFER_TOO_SMALL;
        }
 
-       CopyMem(buffer, loader->addr, loader->size);
+       CopyMem(buffer, (VOID*)loader->addr, loader->size);
        *buffer_size = loader->size;
 
        return EFI_SUCCESS;
diff --git a/kernel-stub/main.c b/kernel-stub/main.c
index 9e5feec..71cbc86 100644
--- a/kernel-stub/main.c
+++ b/kernel-stub/main.c
@@ -206,7 +206,7 @@ EFI_STATUS efi_main(EFI_HANDLE image_handle, 
EFI_SYSTEM_TABLE *system_table)
        kernel_image.ImageBase = (VOID *) (uintptr_t) aligned_kernel_buffer;
        kernel_image.ImageSize = kernel_section->VirtualSize;
 
-       CopyMem(kernel_image.ImageBase, kernel_source, kernel_image.ImageSize);
+       CopyMem(kernel_image.ImageBase, (VOID*)kernel_source, 
kernel_image.ImageSize);
        /* Clear the rest so that .bss is definitely zero. */
        SetMem((UINT8 *) kernel_image.ImageBase + kernel_image.ImageSize,
               pe_header->Opt.SizeOfImage - kernel_image.ImageSize, 0);
-- 
2.44.0

-- 
You received this message because you are subscribed to the Google Groups "EFI 
Boot Guard" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to efibootguard-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/efibootguard-dev/0C21D649-A75E-4D39-8DE6-9B5BF309F1D1%40siemens.com.