Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change getnum() to use intmax_t instead of int, so it doesn't overflow

Browse Source 
between 2^31 and 2^32. Adjust call sites accordingly. PR 43354.
This commit is contained in:
dholland 2010-05-28 07:40:53 +00:00
parent 281afa1ed9
commit 0bf3480c62
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sbin/disklabel/interact.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: interact.c,v 1.33 2009/11/28 10:52:10 abs Exp $ */
/* $NetBSD: interact.c,v 1.34 2010/05/28 07:40:53 dholland Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: interact.c,v 1.33 2009/11/28 10:52:10 abs Exp $");
__RCSID("$NetBSD: interact.c,v 1.34 2010/05/28 07:40:53 dholland Exp $");
#endif /* lint */
#include <sys/param.h>
@ -67,7 +67,7 @@ static int getinput(const char *, const char *, const char *, char *);
static int alphacmp(const void *, const void *);
static void defnum(struct disklabel *, char *, uint32_t);
static void dumpnames(const char *, const char * const *, size_t);
static int getnum(struct disklabel *, char *, int);
static intmax_t getnum(struct disklabel *, char *, intmax_t);
static int rounding = 0; /* sector rounding */
static int chaining = 0; /* make partitions contiguous */
@ -444,6 +444,7 @@ static void
cmd_part(struct disklabel *lp, char *s, int fd)
{
int i;
intmax_t im;
char line[BUFSIZ];
char def[BUFSIZ];
int part;
@ -503,14 +504,15 @@ cmd_part(struct disklabel *lp, char *s, int fd)
cp[line[0] - 'a'].p_size;
}
} else {
if ((i = getnum(lp, line, 0)) == -1 || i < 0) {
if ((im = getnum(lp, line, 0)) == -1 || im < 0) {
printf("Bad offset `%s'\n", line);
continue;
} else if ((uint32_t)i > lp->d_secperunit) {
} else if (im > 0xffffffffLL ||
(uint32_t)im > lp->d_secperunit) {
printf("Offset `%s' out of range\n", line);
continue;
}
p->p_offset = i;
p->p_offset = (uint32_t)im;
}
break;
}
@ -522,16 +524,16 @@ cmd_part(struct disklabel *lp, char *s, int fd)
return;
else if (i == 0)
break;
if ((i = getnum(lp, line, lp->d_secperunit - p->p_offset))
if ((im = getnum(lp, line, lp->d_secperunit - p->p_offset))
== -1) {
printf("Bad size `%s'\n", line);
continue;
} else if
((i + p->p_offset) > lp->d_secperunit) {
} else if (im > 0xffffffffLL ||
(im + p->p_offset) > lp->d_secperunit) {
printf("Size `%s' out of range\n", line);
continue;
}
p->p_size = i;
p->p_size = im;
break;
}
@ -708,15 +710,15 @@ defnum(struct disklabel *lp, char *buf, uint32_t size)
}
static int
getnum(struct disklabel *lp, char *buf, int max)
static intmax_t
getnum(struct disklabel *lp, char *buf, intmax_t defaultval)
{
char *ep;
double d;
int rv;
intmax_t rv;
if (max && buf[0] == '$' && buf[1] == 0)
return max;
if (defaultval && buf[0] == '$' && buf[1] == 0)
return defaultval;
d = strtod(buf, &ep);
if (buf == ep)
@ -729,32 +731,32 @@ getnum(struct disklabel *lp, char *buf, int max)
case '\0':
case 's':
case 'S':
rv = (int) d;
rv = (intmax_t) d;
break;
case 'c':
case 'C':
rv = (int) (d * lp->d_secpercyl);
rv = (intmax_t) (d * lp->d_secpercyl);
break;
case 'k':
case 'K':
rv = (int) (d * 1024 / lp->d_secsize);
rv = (intmax_t) (d * 1024 / lp->d_secsize);
break;
case 'm':
case 'M':
rv = (int) (d * 1024 * 1024 / lp->d_secsize);
rv = (intmax_t) (d * 1024 * 1024 / lp->d_secsize);
break;
case 'g':
case 'G':
rv = (int) (d * 1024 * 1024 * 1024 / lp->d_secsize);
rv = (intmax_t) (d * 1024 * 1024 * 1024 / lp->d_secsize);
break;
case 't':
case 'T':
rv = (int) (d * 1024 * 1024 * 1024 * 1024 / lp->d_secsize);
rv = (intmax_t) (d * 1024 * 1024 * 1024 * 1024 / lp->d_secsize);
break;
default: