vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

gpt: properly detect and repair invalid tables

Browse source 
GPT_BOTH_VALID is 4 bits so simple a boolean check is not sufficient.
This broken condition allowed gptprio to trust bogus disk locations in
headers that were marked invalid causing arbitrary disk corruption.
This commit is contained in:
Michael Marineau 2016-08-20 17:42:12 -07:00
parent 4d91c78833
commit 6078f83638
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/commands/gptprio.c
View file

@ -91,7 +91,7 @@ grub_find_next (const char *disk_name,
if (!gpt) if (!gpt)
goto done; goto done;
if (!(gpt->status & GRUB_GPT_BOTH_VALID)) if ((gpt->status & GRUB_GPT_BOTH_VALID) != GRUB_GPT_BOTH_VALID)
if (grub_gpt_repair (dev->disk, gpt)) if (grub_gpt_repair (dev->disk, gpt))
goto done; goto done;

2
grub-core/lib/gpt.c
View file

@ -593,7 +593,7 @@ grub_gpt_write (grub_disk_t disk, grub_gpt_t gpt)
{ {
/* TODO: update/repair protective MBRs too. */ /* TODO: update/repair protective MBRs too. */
if (!(gpt->status & GRUB_GPT_BOTH_VALID)) if ((gpt->status & GRUB_GPT_BOTH_VALID) != GRUB_GPT_BOTH_VALID)
return grub_error (GRUB_ERR_BAD_PART_TABLE, "Invalid GPT data"); return grub_error (GRUB_ERR_BAD_PART_TABLE, "Invalid GPT data");
grub_dprintf ("gpt", "writing primary GPT to %s\n", disk->name); grub_dprintf ("gpt", "writing primary GPT to %s\n", disk->name);