mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-30 16:51:41 +00:00
Code Issues Releases Activity

Improve check for protective MBR. Instead of assiming that protective

Browse Source 
MBR should have only one entry of type 0xEE, consider protective MBR
to be one, that has at least one entry of type 0xEE covering the whole
unit. This makes GEOM_GPT compatible with disks partitioned by the
Apple's BootCamp.

Approved in principle by:       marcel
MFC After:			1 month
This commit is contained in:
Maxim Sobolev 2006-06-26 00:32:54 +00:00
parent feb0c348cf
commit d5046da865
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=159936
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/geom/geom_gpt.c
View File

@ -360,31 +360,50 @@ g_gpt_has_pmbr(struct g_consumer *cp, int *error)
{
char *buf;
uint8_t *typ;
int i, pmbr;
int i, pmbr, vmbr;
uint16_t magic;
uint32_t dp_start, dp_size;
buf = g_read_data(cp, 0L, cp->provider->sectorsize, error);
if (buf == NULL)
return (0);
pmbr = 0;
vmbr = 0;
magic = le16toh(*(uint16_t *)(uintptr_t)(buf + DOSMAGICOFFSET));
if (magic != DOSMAGIC)
goto out;
/*
* Check that there are at least one partition of type
* DOSPTYP_PMBR that covers the whole unit.
*/
for (i = 0; i < 4; i++) {
typ = buf + DOSPARTOFF + i * sizeof(struct dos_partition) +
offsetof(struct dos_partition, dp_typ);
bcopy(buf + DOSPARTOFF + i * sizeof(struct dos_partition) +
offsetof(struct dos_partition, dp_start), &dp_start, sizeof(dp_start));
bcopy(buf + DOSPARTOFF + i * sizeof(struct dos_partition) +
offsetof(struct dos_partition, dp_size), &dp_size, sizeof(dp_size));
if ((*typ == DOSPTYP_PMBR) &&
(le32toh(dp_start) == 1) &&
(cp->provider->mediasize ==
(le32toh(dp_size) * 512ULL))) {
pmbr = 1;
break;
}
if (*typ != 0 && *typ != DOSPTYP_PMBR)
goto out;
vmbr = 1;
}
pmbr = 1;
out:
g_free(buf);
return (pmbr);
/*
* Return true if protective MBR is detected or if MBR has
* no valid entries at all.
*/
return (pmbr || !vmbr);
}
static void