summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorae <ae@FreeBSD.org>2013-08-08 11:24:25 +0000
committerae <ae@FreeBSD.org>2013-08-08 11:24:25 +0000
commit612b57c66cc5aaca953d81189ee30c495f59dccd (patch)
tree336a7f4f1529b232ed07e58d765d76e4470699e3 /sys/boot
parent0a3b2e376d150258c8294c12a85bec99546ab84b (diff)
downloadFreeBSD-src-612b57c66cc5aaca953d81189ee30c495f59dccd.zip
FreeBSD-src-612b57c66cc5aaca953d81189ee30c495f59dccd.tar.gz
Make the check for number of entries less strict.
Some partitioning tools can create GPT with number of entries less than 128. MFC after: 1 week
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/common/part.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/boot/common/part.c b/sys/boot/common/part.c
index 2b3a16f..d37eee5 100644
--- a/sys/boot/common/part.c
+++ b/sys/boot/common/part.c
@@ -181,7 +181,7 @@ gpt_checkhdr(struct gpt_hdr *hdr, uint64_t lba_self, uint64_t lba_last,
}
hdr->hdr_entries = le32toh(hdr->hdr_entries);
hdr->hdr_entsz = le32toh(hdr->hdr_entsz);
- if (hdr->hdr_entries < 128 ||
+ if (hdr->hdr_entries == 0 ||
hdr->hdr_entsz < sizeof(struct gpt_ent) ||
sectorsize % hdr->hdr_entsz != 0) {
DEBUG("invalid entry size or number of entries");
@@ -203,11 +203,14 @@ gpt_checktbl(const struct gpt_hdr *hdr, u_char *tbl, size_t size,
int i, cnt;
cnt = size / hdr->hdr_entsz;
- /* Check CRC only when buffer size is enough for table. */
- if (hdr->hdr_entries <= cnt &&
- crc32(tbl, size) != hdr->hdr_crc_table) {
- DEBUG("GPT table's CRC doesn't match");
- return (-1);
+ if (hdr->hdr_entries <= cnt) {
+ cnt = hdr->hdr_entries;
+ /* Check CRC only when buffer size is enough for table. */
+ if (hdr->hdr_crc_table !=
+ crc32(tbl, hdr->hdr_entries * hdr->hdr_entsz)) {
+ DEBUG("GPT table's CRC doesn't match");
+ return (-1);
+ }
}
ent = (struct gpt_ent *)tbl;
for (i = 0; i < cnt; i++, ent++) {
OpenPOWER on IntegriCloud