Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modify intel partition mapper to fail if it detects a GPT disk

Browse Source 
Slightly amended patch from Tyler Dixon. This fixes #8434.
Tested on my new GPT-disk with:
	jam run ":<build>makebootable" --dry-run /dev/sda4

Signed-off-by: Fredrik Holmqvist <fredrik.holmqvist@gmail.com>
This commit is contained in:
Tyler Dixon 2012-05-01 13:03:41 -04:00 committed by Fredrik Holmqvist
parent 2574bdfcc7
commit 36b210830f
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
View File

@ -33,11 +33,21 @@
# define TRACE(x) ;
#endif
#ifdef _USER_MODE
# define ERROR(x) printf x
#else
# define ERROR(x) dprintf x
#endif
using std::nothrow;
// Maximal number of logical partitions per extended partition we allow.
static const int32 kMaxLogicalPartitionCount = 128;
// Constants used to verify if a disk uses a GPT
static const int32 kGPTSignatureSize = 8;
static const char kGPTSignature[8] = { 'E', 'F', 'I', ' ', 'P', 'A', 'R', 'T' };
// constructor
PartitionMapParser::PartitionMapParser(int deviceFD, off_t sessionOffset,
@ -295,20 +305,32 @@ PartitionMapParser::_ReadPartitionTable(off_t offset, partition_table* table)
if (table == NULL)
table = fPartitionTable;
status_t error = B_OK;
// read
if (read_pos(fDeviceFD, fSessionOffset + offset, table, toRead) != toRead) {
#ifndef _BOOT_MODE
error = errno;
if (error == B_OK)
error = B_IO_ERROR;
#else
error = B_IO_ERROR;
#endif
TRACE(("intel: _ReadPartitionTable(): reading the partition table "
"failed: %lx\n", error));
// Read the partition table from the device into the table structure
ssize_t bytesRead = read_pos(fDeviceFD, fSessionOffset + offset,
table, toRead);
if (bytesRead != (ssize_t)toRead) {
TRACE(("intel: _ReadPartitionTable(): reading the partition "
"table failed: %lx\n", errno));
return bytesRead < 0 ? errno : B_IO_ERROR;
}
return error;
// check for GPT signature "EFI PART"
// located in the 8bytes following the mbr
toRead = kGPTSignatureSize;
char gptSignature[8];
bytesRead = read_pos(fDeviceFD, fSessionOffset + offset
+ sizeof(partition_table), &gptSignature, toRead);
if (bytesRead != (ssize_t)toRead) {
TRACE(("intel: _ReadPartitionTable(): checking for GPT "
"signature failed: %lx\n", errno));
return bytesRead < 0 ? errno : B_IO_ERROR;
}
if (memcmp(gptSignature, kGPTSignature, kGPTSignatureSize) == 0) {
ERROR(("Error: Disk is GPT-formatted: "
"GPT disks are currently unsupported.\n"));
return B_BAD_DATA;
}
return B_OK;
}