berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

Merge branch 'gpt' into 'master' 

Fix GPT sanity check for 1-sector partitions

See merge request nakst/essence!5
This commit is contained in:
nakst 2023-08-11 17:25:54 +00:00
parent ceb7285d91 9738f7148e
commit 0a70170952
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shared/partitions.cpp
View File

@ -133,8 +133,6 @@ bool GPTGetPartitions(uint8_t *block /* K_SIGNATURE_BLOCK_SIZE */, EsFileOffset
partitionEntryCount = GPT_PARTITION_COUNT;
}
bool foundESP = false;
for (uintptr_t i = 0; i < partitionEntryCount; i++) {
uint8_t *entry = block + sectorBytes * 2 + i * partitionEntryBytes;
@ -147,22 +145,14 @@ bool GPTGetPartitions(uint8_t *block /* K_SIGNATURE_BLOCK_SIZE */, EsFileOffset
continue;
}
if ((!guidLow && !guidHigh) || firstLBA >= sectorCount || lastLBA >= sectorCount || firstLBA >= lastLBA) {
if (firstLBA >= sectorCount || lastLBA >= sectorCount || firstLBA > lastLBA) {
return false;
}
partitions[i].present = true;
partitions[i].offset = firstLBA;
partitions[i].count = lastLBA - firstLBA;
partitions[i].count = lastLBA - firstLBA + 1;
partitions[i].isESP = guidLow == 0x11D2F81FC12A7328 && guidHigh == 0x3BC93EC9A0004BBA;
if (partitions[i].isESP) {
if (foundESP) {
return false;
} else {
foundESP = true;
}
}
}
return true;