i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpt partitioning: fix writing of partition entries.

Browse Source 
When writing an individual entry to disk, the offset of the entry
was omitted, which resulted in entries not block-aligned to
overwrite previously valid entries. This in turn resulted in the
stored entries CRC no longer matching what was on disk, causing
the partitioning system to fail to identify it as a valid GPT
when read from disk later (e.g. after a reboot).

E.g. if the first entry is the ESP (which it typically is), and
then the second being an entry for a BFS partition, updating the
BFS partition entry would overwrite the entry for the ESP, thus
corrupting the entries table.
This commit is contained in:
Jessica Hamilton
2015-10-08 02:12:13 +00:00
parent e7b341a75e
commit 2346363b23
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/partitioning_systems/gpt/Header.cpp
+4 -4
View File
@@ -193,7 +193,7 @@ Header::WriteEntry(int fd, uint32 entryIndex)
uint32 entryOffset = entryIndex * fHeader.EntrySize() % fBlockSize;
status_t status = _Write(fd,
(fHeader.EntriesBlock() + blockOffset) * fBlockSize,
(fHeader.EntriesBlock() + blockOffset) * fBlockSize + entryOffset,
fEntries + entryOffset, fBlockSize);
if (status != B_OK)
return status;
@@ -203,7 +203,7 @@ Header::WriteEntry(int fd, uint32 entryIndex)
// Write backup
status_t backupStatus = _Write(fd,
(fBackupHeader.EntriesBlock() + blockOffset) * fBlockSize,
(fBackupHeader.EntriesBlock() + blockOffset) * fBlockSize + entryOffset,
fEntries + entryOffset, fBlockSize);
return status == B_OK ? backupStatus : status;
@@ -351,7 +351,7 @@ Header::_Dump(const efi_table_header& header)
dprintf("EFI header: %.8s\n", header.header);
dprintf("EFI revision: %" B_PRIx32 "\n", header.Revision());
dprintf("header size: %" B_PRId32 "\n", header.HeaderSize());
dprintf("header CRC: %" B_PRId32 "\n", header.HeaderCRC());
dprintf("header CRC: %" B_PRIx32 "\n", header.HeaderCRC());
dprintf("absolute block: %" B_PRIu64 "\n", header.AbsoluteBlock());
dprintf("alternate block: %" B_PRIu64 "\n", header.AlternateBlock());
dprintf("first usable block: %" B_PRIu64 "\n", header.FirstUsableBlock());
@@ -360,7 +360,7 @@ Header::_Dump(const efi_table_header& header)
dprintf("entries block: %" B_PRIu64 "\n", header.EntriesBlock());
dprintf("entry size: %" B_PRIu32 "\n", header.EntrySize());
dprintf("entry count: %" B_PRIu32 "\n", header.EntryCount());
dprintf("entries CRC: %" B_PRIu32 "\n", header.EntriesCRC());
dprintf("entries CRC: %" B_PRIx32 "\n", header.EntriesCRC());
}