From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lFhUm-0002K7-DB for mharc-grub-devel@gnu.org; Fri, 26 Feb 2021 13:05:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFhUk-0002EB-Bw for grub-devel@gnu.org; Fri, 26 Feb 2021 13:05:42 -0500 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:33792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lFhUi-0005ZK-9d for grub-devel@gnu.org; Fri, 26 Feb 2021 13:05:41 -0500 Received: by mail-qk1-x729.google.com with SMTP id x124so9989697qkc.1 for ; Fri, 26 Feb 2021 10:05:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ncl5557TNkfdpX/qF9njYgJldXhA7M5aVtbdbufAwto=; b=su652RUetImpmb8gmhDebUc2s8sJtx8Xy6zg37ei7RDT/UwSSny2lehXYKmJX5D2fy m5rKeVJxe9FVTt4hyPa+zIepZ3D6kh1mwmOYphIospGxLtc1sO6hZcAtgSZumy4kg4iJ 0Uru/SY4NmOh8vHVEKpv0sZgNlBh+/5+Yfc0wN0So40YhpH+xwvj9mB7/5FUjaeSEJna iasc3KiWF/Td22gQXXv+JYN6VELqoCo1i1+cwBOYub4BFvSvftWEPZr8yitgXiVn/PZp nD8r/RuaZSXjaFyOiipXWdD1AoOWEtbPtaZ8IiRbQWuTVf0WmWzac4OBhqJ6BJmc4VtP Z2wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ncl5557TNkfdpX/qF9njYgJldXhA7M5aVtbdbufAwto=; b=kyISrEA7vH4aGpuUXF+C1N9l0JlC0B375f7ePT7ENgJ4ps5p/TIVTYiSrNTOBWSwkL 2y2ViCyjdxwrQrSBwZfFQrT+mCkM5wH1qVEy8bC81Ybms4NUioYZSOUuvLrKK4xXdVTe dNAPOv4eS1zVrXgeYGHlTAucEhJg8yagegCIxRSNUTjxCevYP0X+Diybr7h3sfo94ylu B4SfL7t6W4yVV9NGXtq8/KwnYny9gV642CiPHnleX2jOhjRAkD196ZJMeyHmqcOEdrIV qCqJAtDVS89X/zevo9cggTFil4MEEWJRuWYHVEmBw/pON7KWsezWVvQBL/gCNkaopBlg V0KA== X-Gm-Message-State: AOAM533U46vMKW/LWGSyiWsKyJP9Gu2cbKzXMvidf85YYdBJMbG8D9oH FoyjywNy0jSTAFMTVMJIlDDTbi1/JIZH5bPtDcLbHUX2GGHjtU3WaY/vfpsXXWu8ONwUSSf40IW NaLpluJG6u6TRVCPDs36vEXZkahJapbSYsCfac37zJgnuY1/jbRjjq+MBA9h21n4L0m4= X-Google-Smtp-Source: ABdhPJxBq2tWp2nXxisuGxXrb+XmfIgChU6eGMZnfBwpC8quwbxPfTsRizjzDjcg2mXyO4Rv3MBtEw== X-Received: by 2002:a37:8185:: with SMTP id c127mr3891175qkd.275.1614362737901; Fri, 26 Feb 2021 10:05:37 -0800 (PST) Received: from localhost.localdomain.ca (S0106000c29a85402.wp.shawcable.net. [50.71.215.171]) by smtp.gmail.com with ESMTPSA id b137sm6814479qkg.51.2021.02.26.10.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 10:05:37 -0800 (PST) From: Derek Foreman To: grub-devel@gnu.org Cc: linux@endlessos.org, Derek Foreman Subject: [PATCH] commands/file: Fix array/enum desync Date: Fri, 26 Feb 2021 12:05:07 -0600 Message-Id: <20210226180507.395780-1-derek@endlessos.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::729; envelope-from=derek@endlessos.org; helo=mail-qk1-x729.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2021 18:05:42 -0000 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 --- 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