d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fdisk(8) to create 2TB partitions on disks larger than 2TB, rather than

Browse Source 
only being able to create 1TB partitions:
o) Use an unsigned 32-bit quantity to store the number of disk sectors.
o) Detect overflow of said 32-bit quantity and clamp to 2^32.
o) Rather than returning the disk sector count from get_params, return 0 on
   success, since its return value is only ever compared to -1 to detect
   failure.  This would cause returning 2^32 sectors to be interpreted as an
   error.

Reviewed by:	bde ("good for a quick fix")
This commit is contained in:
Juli Mallett 2013-11-27 17:59:13 +00:00
parent 168d70db8a
commit c69a7a718d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/fdisk/fdisk.c
View File

@ -75,7 +75,8 @@ static int secsize = 0; /* the sensed sector size */
static char *disk;
static int cyls, sectors, heads, cylsecs, disksecs;
static int cyls, sectors, heads, cylsecs;
static u_int32_t disksecs;
struct mboot {
unsigned char *bootinst; /* boot code */
@ -873,10 +874,13 @@ get_params()
o = g_mediasize(fd);
if (o < 0)
return (-1);
disksecs = o / u;
if (o / u <= NO_DISK_SECTORS)
disksecs = o / u;
else
disksecs = NO_DISK_SECTORS;
cyls = dos_cyls = o / (u * dos_heads * dos_sectors);
return (disksecs);
return (0);
}
static int