From cfbdf6c3c5f63ba5dc99509b68a249c15398d283 Mon Sep 17 00:00:00 2001 From: "Andrey V. Elsukov" Date: Sun, 8 May 2011 11:16:17 +0000 Subject: [PATCH] Limit number of sectors that can be addressed. MFC after: 1 week --- sys/geom/part/g_part_mbr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c index 63b7e6448aa9..838f09ce3e9f 100644 --- a/sys/geom/part/g_part_mbr.c +++ b/sys/geom/part/g_part_mbr.c @@ -262,7 +262,7 @@ g_part_mbr_create(struct g_part_table *basetable, struct g_part_parms *gpp) if (pp->sectorsize < MBRSIZE) return (ENOSPC); - msize = MIN(pp->mediasize / pp->sectorsize, 0xffffffff); + msize = MIN(pp->mediasize / pp->sectorsize, UINT_MAX); basetable->gpt_first = basetable->gpt_sectors; basetable->gpt_last = msize - (msize % basetable->gpt_sectors) - 1; @@ -433,7 +433,7 @@ g_part_mbr_read(struct g_part_table *basetable, struct g_consumer *cp) pp = cp->provider; table = (struct g_part_mbr_table *)basetable; - msize = pp->mediasize / pp->sectorsize; + msize = MIN(pp->mediasize / pp->sectorsize, UINT_MAX); buf = g_read_data(cp, 0L, pp->sectorsize, &error); if (buf == NULL)