diff options
author | ae <ae@FreeBSD.org> | 2011-05-08 12:28:13 +0000 |
---|---|---|
committer | ae <ae@FreeBSD.org> | 2011-05-08 12:28:13 +0000 |
commit | c286c25c24b9a15205c9702097bc1df37ff3e9ae (patch) | |
tree | 87bb38e096f09c9fe306adcde985fba5f55b4e0a /sys/geom | |
parent | fae1db6c962c5dfecacca94b02acbfb76d9fa2c4 (diff) | |
download | FreeBSD-src-c286c25c24b9a15205c9702097bc1df37ff3e9ae.zip FreeBSD-src-c286c25c24b9a15205c9702097bc1df37ff3e9ae.tar.gz |
Limit number of sectors that can be addressed.
MFC after: 1 week
Diffstat (limited to 'sys/geom')
-rw-r--r-- | sys/geom/part/g_part_vtoc8.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/geom/part/g_part_vtoc8.c b/sys/geom/part/g_part_vtoc8.c index e59c8e4..245d1f9 100644 --- a/sys/geom/part/g_part_vtoc8.c +++ b/sys/geom/part/g_part_vtoc8.c @@ -198,9 +198,7 @@ g_part_vtoc8_create(struct g_part_table *basetable, struct g_part_parms *gpp) table = (struct g_part_vtoc8_table *)basetable; - msize = pp->mediasize / pp->sectorsize; - if (msize > 0xffffffffu) - msize = 0xffffffffu; + msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX); table->secpercyl = basetable->gpt_sectors * basetable->gpt_heads; pcyls = msize / table->secpercyl; acyls = 2; @@ -392,8 +390,7 @@ g_part_vtoc8_read(struct g_part_table *basetable, struct g_consumer *cp) bcopy(buf, &table->vtoc, sizeof(table->vtoc)); g_free(buf); - msize = pp->mediasize / pp->sectorsize; - + msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX); sectors = be16dec(&table->vtoc.nsecs); if (sectors < 1) goto invalid_label; |