svn commit: r221644 - head/sys/geom/part

Andrey V. Elsukov ae at FreeBSD.org
Sun May 8 11:16:18 UTC 2011


Author: ae
Date: Sun May  8 11:16:17 2011
New Revision: 221644
URL: http://svn.freebsd.org/changeset/base/221644

Log:
  Limit number of sectors that can be addressed.
  
  MFC after:	1 week

Modified:
  head/sys/geom/part/g_part_mbr.c

Modified: head/sys/geom/part/g_part_mbr.c
==============================================================================
--- head/sys/geom/part/g_part_mbr.c	Sun May  8 11:10:56 2011	(r221643)
+++ head/sys/geom/part/g_part_mbr.c	Sun May  8 11:16:17 2011	(r221644)
@@ -262,7 +262,7 @@ g_part_mbr_create(struct g_part_table *b
 	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 *bas
 
 	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)


More information about the svn-src-head mailing list