From: Derek Foreman Date: Fri, 26 Feb 2021 18:05:07 +0000 (-0600) Subject: commands/file: Fix array/enum desync X-Git-Tag: grub-2.06-rc1~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9340f5cbce130d97ae31af6091c060763449b699;p=thirdparty%2Fgrub.git commands/file: Fix array/enum desync The commit f1957dc8a (RISC-V: Add to build system) added two entries to the options array, but only 1 entry to the enum. This resulted in everything after the insertion point being off by one. This broke at least the "file --is-hibernated-hiberfil" command. Bring the two back in sync by splitting the IS_RISCV_EFI enum entry into two, as is done for other architectures. Signed-off-by: Derek Foreman Reviewed-by: Daniel Kiper --- diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c index 2574e6685..9de00061e 100644 --- a/grub-core/commands/file.c +++ b/grub-core/commands/file.c @@ -134,7 +134,8 @@ enum IS_IA_EFI, IS_ARM64_EFI, IS_ARM_EFI, - IS_RISCV_EFI, + IS_RISCV32_EFI, + IS_RISCV64_EFI, IS_HIBERNATED, IS_XNU64, IS_XNU32, @@ -576,7 +577,8 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args) case IS_IA_EFI: case IS_ARM64_EFI: case IS_ARM_EFI: - case IS_RISCV_EFI: + case IS_RISCV32_EFI: + case IS_RISCV64_EFI: { char signature[4]; grub_uint32_t pe_offset; @@ -622,13 +624,13 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args) && coff_head.machine != grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_ARMTHUMB_MIXED)) break; - if (type == IS_RISCV_EFI + if ((type == IS_RISCV32_EFI || type == IS_RISCV64_EFI) && coff_head.machine != grub_cpu_to_le16_compile_time (GRUB_PE32_MACHINE_RISCV64)) /* TODO: Determine bitness dynamically */ break; if (type == IS_IA_EFI || type == IS_64_EFI || type == IS_ARM64_EFI || - type == IS_RISCV_EFI) + type == IS_RISCV32_EFI || type == IS_RISCV64_EFI) { struct grub_pe64_optional_header o64; if (grub_file_read (file, &o64, sizeof (o64)) != sizeof (o64))