[PATCH] commands/file: Fix array/enum desync

[PATCH] commands/file: Fix array/enum desync

[Derek Foreman]

commit f1957dc8a3347278a095bc8f44197662559a8ba3 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 RISCV enum entry into two,
as is done for other architectures.

Signed-off-by: Derek Foreman <derek@endlessos.org>
---
 grub-core/commands/file.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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))
-- 
2.26.2

Re: [PATCH] commands/file: Fix array/enum desync

[Daniel Kiper]

On Fri, Feb 26, 2021 at 12:05:07PM -0600, Derek Foreman wrote:
> commit f1957dc8a3347278a095bc8f44197662559a8ba3 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 RISCV enum entry into two,
> as is done for other architectures.
>
> Signed-off-by: Derek Foreman <derek@endlessos.org>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel