Fix a bug when use workaround for Legacy BIOS access limitation with GPT partition style

7cdc7386 · longpanda · 44bb72ca · 7cdc7386
Commit 7cdc7386 authored Jan 08, 2021 by longpanda
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 5 deletions

GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c +18 -5

No files found.
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
@@ -1772,12 +1772,25 @@ int ventoy_check_device(grub_device_t dev)
    if (workaround)
    {
-        ventoy_part_table *PartTbl = g_ventoy_part_info->MBR.PartTbl;
+        if (grub_strncmp(g_ventoy_part_info->Head.Signature, "EFI PART", 8) == 0)
-        if (PartTbl[1].StartSectorId != PartTbl[0].StartSectorId + PartTbl[0].SectorCount ||
-            PartTbl[1].SectorCount != 65536)
        {
-            grub_file_close(file);
+            ventoy_gpt_part_tbl *PartTbl = g_ventoy_part_info->PartTbl;
-            return ventoy_check_device_result(6);
+            if (PartTbl[1].StartLBA != PartTbl[0].LastLBA + 1 ||
+                (PartTbl[1].LastLBA + 1 - PartTbl[1].StartLBA) != 65536)
+            {
+                grub_file_close(file);
+                return ventoy_check_device_result(6);
+            }
+        }
+        else
+        {
+            ventoy_part_table *PartTbl = g_ventoy_part_info->MBR.PartTbl;
+            if (PartTbl[1].StartSectorId != PartTbl[0].StartSectorId + PartTbl[0].SectorCount ||
+                PartTbl[1].SectorCount != 65536)
+            {
+                grub_file_close(file);
+                return ventoy_check_device_result(6);
+            }
        }
    }
    else