util/cutils: Let qemu_strtosz*() optionally reject trailing crap

Change the qemu_strtosz() & friends to return -EINVAL when @endptr is
null and the conversion doesn't consume the string completely.
Matches how qemu_strtol() & friends work.

Only test_qemu_strtosz_simple() passes a null @endptr.  No functional
change there, because its conversion consumes the string.

Simplify callers that use @endptr only to fail when it doesn't point
to '\0' to pass a null @endptr instead.

Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com> (maintainer:X86)
Cc: Kevin Wolf <kwolf@redhat.com> (supporter:Block layer core)
Cc: Max Reitz <mreitz@redhat.com> (supporter:Block layer core)
Cc: qemu-block@nongnu.org (open list:Block layer core)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1487708048-2131-22-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-21 21:14:05 +01:00
parent 606caa0a2a
commit 4fcdf65ae2
8 changed files with 25 additions and 31 deletions

6
hmp.c
View File

@ -1346,7 +1346,6 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
const char *valuestr = qdict_get_str(qdict, "value"); const char *valuestr = qdict_get_str(qdict, "value");
int64_t valuebw = 0; int64_t valuebw = 0;
long valueint = 0; long valueint = 0;
char *endp;
Error *err = NULL; Error *err = NULL;
bool use_int_value = false; bool use_int_value = false;
int i; int i;
@ -1385,9 +1384,8 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
break; break;
case MIGRATION_PARAMETER_MAX_BANDWIDTH: case MIGRATION_PARAMETER_MAX_BANDWIDTH:
p.has_max_bandwidth = true; p.has_max_bandwidth = true;
valuebw = qemu_strtosz_MiB(valuestr, &endp); valuebw = qemu_strtosz_MiB(valuestr, NULL);
if (valuebw < 0 || (size_t)valuebw != valuebw if (valuebw < 0 || (size_t)valuebw != valuebw) {
|| *endp != '\0') {
error_setg(&err, "Invalid size %s", valuestr); error_setg(&err, "Invalid size %s", valuestr);
goto cleanup; goto cleanup;
} }

View File

@ -1267,10 +1267,8 @@ static void ivshmem_realize(PCIDevice *dev, Error **errp)
if (s->sizearg == NULL) { if (s->sizearg == NULL) {
s->legacy_size = 4 << 20; /* 4 MB default */ s->legacy_size = 4 << 20; /* 4 MB default */
} else { } else {
char *end; int64_t size = qemu_strtosz_MiB(s->sizearg, NULL);
int64_t size = qemu_strtosz_MiB(s->sizearg, &end); if (size < 0 || (size_t)size != size || !is_power_of_2(size)) {
if (size < 0 || (size_t)size != size || *end != '\0'
|| !is_power_of_2(size)) {
error_setg(errp, "Invalid size %s", s->sizearg); error_setg(errp, "Invalid size %s", s->sizearg);
return; return;
} }

View File

@ -482,15 +482,14 @@ opts_type_size(Visitor *v, const char *name, uint64_t *obj, Error **errp)
OptsVisitor *ov = to_ov(v); OptsVisitor *ov = to_ov(v);
const QemuOpt *opt; const QemuOpt *opt;
int64_t val; int64_t val;
char *endptr;
opt = lookup_scalar(ov, name, errp); opt = lookup_scalar(ov, name, errp);
if (!opt) { if (!opt) {
return; return;
} }
val = qemu_strtosz(opt->str ? opt->str : "", &endptr); val = qemu_strtosz(opt->str ? opt->str : "", NULL);
if (val < 0 || *endptr) { if (val < 0) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name,
"a size value representible as a non-negative int64"); "a size value representible as a non-negative int64");
return; return;

View File

@ -370,14 +370,9 @@ static int add_old_style_options(const char *fmt, QemuOpts *opts,
static int64_t cvtnum(const char *s) static int64_t cvtnum(const char *s)
{ {
char *end;
int64_t ret; int64_t ret;
ret = qemu_strtosz(s, &end); ret = qemu_strtosz(s, NULL);
if (*end != '\0') {
/* Detritus at the end of the string */
return -EINVAL;
}
return ret; return ret;
} }

View File

@ -137,14 +137,9 @@ static char **breakline(char *input, int *count)
static int64_t cvtnum(const char *s) static int64_t cvtnum(const char *s)
{ {
char *end;
int64_t ret; int64_t ret;
ret = qemu_strtosz(s, &end); ret = qemu_strtosz(s, NULL);
if (*end != '\0') {
/* Detritus at the end of the string */
return -EINVAL;
}
return ret; return ret;
} }

View File

@ -2034,10 +2034,9 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
/* Special case: */ /* Special case: */
if (!strcmp(name, "tsc-freq")) { if (!strcmp(name, "tsc-freq")) {
int64_t tsc_freq; int64_t tsc_freq;
char *err;
tsc_freq = qemu_strtosz_metric(val, &err); tsc_freq = qemu_strtosz_metric(val, NULL);
if (tsc_freq < 0 || *err) { if (tsc_freq < 0) {
error_setg(errp, "bad numerical value %s", val); error_setg(errp, "bad numerical value %s", val);
return; return;
} }

View File

@ -1510,10 +1510,16 @@ static void test_qemu_strtosz_trailing(void)
g_assert_cmpint(res, ==, 123 * M_BYTE); g_assert_cmpint(res, ==, 123 * M_BYTE);
g_assert(endptr == str + 3); g_assert(endptr == str + 3);
res = qemu_strtosz(str, NULL);
g_assert_cmpint(res, ==, -EINVAL);
str = "1kiB"; str = "1kiB";
res = qemu_strtosz(str, &endptr); res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 1024); g_assert_cmpint(res, ==, 1024);
g_assert(endptr == str + 2); g_assert(endptr == str + 2);
res = qemu_strtosz(str, NULL);
g_assert_cmpint(res, ==, -EINVAL);
} }
static void test_qemu_strtosz_erange(void) static void test_qemu_strtosz_erange(void)

View File

@ -208,7 +208,7 @@ static int64_t suffix_mul(char suffix, int64_t unit)
static int64_t do_strtosz(const char *nptr, char **end, static int64_t do_strtosz(const char *nptr, char **end,
const char default_suffix, int64_t unit) const char default_suffix, int64_t unit)
{ {
int64_t retval = -EINVAL; int64_t retval;
char *endptr; char *endptr;
unsigned char c; unsigned char c;
int mul_required = 0; int mul_required = 0;
@ -217,7 +217,8 @@ static int64_t do_strtosz(const char *nptr, char **end,
errno = 0; errno = 0;
val = strtod(nptr, &endptr); val = strtod(nptr, &endptr);
if (isnan(val) || endptr == nptr || errno != 0) { if (isnan(val) || endptr == nptr || errno != 0) {
goto fail; retval = -EINVAL;
goto out;
} }
fraction = modf(val, &integral); fraction = modf(val, &integral);
if (fraction != 0) { if (fraction != 0) {
@ -232,17 +233,20 @@ static int64_t do_strtosz(const char *nptr, char **end,
assert(mul >= 0); assert(mul >= 0);
} }
if (mul == 1 && mul_required) { if (mul == 1 && mul_required) {
goto fail; retval = -EINVAL;
goto out;
} }
if ((val * mul >= INT64_MAX) || val < 0) { if ((val * mul >= INT64_MAX) || val < 0) {
retval = -ERANGE; retval = -ERANGE;
goto fail; goto out;
} }
retval = val * mul; retval = val * mul;
fail: out:
if (end) { if (end) {
*end = endptr; *end = endptr;
} else if (*endptr) {
retval = -EINVAL;
} }
return retval; return retval;