[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/8] vl.c: validate -numa "cpus" parameter properly
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 8/8] vl.c: validate -numa "cpus" parameter properly |
Date: |
Wed, 16 Jan 2013 13:24:11 -0200 |
- Accept empty strings without aborting
- Use parse_uint*() to parse numbers
- Abort if anything except '-' or end-of-string is found after the first
number.
- Check for endvalue < value
Also change the MAX_CPUMASK_BITS warning message from "A max of %d CPUs
are supported in a guest" to "qemu: NUMA: A max of %d VCPUs are
supported".
Signed-off-by: Eduardo Habkost <address@hidden>
---
Cc: Eric Blake <address@hidden>
---
vl.c | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/vl.c b/vl.c
index 98cf9f0..2d156e2 100644
--- a/vl.c
+++ b/vl.c
@@ -1246,21 +1246,43 @@ static void numa_node_parse_cpus(int nodenr, const char
*cpus)
char *endptr;
unsigned long long value, endvalue;
- value = strtoull(cpus, &endptr, 10);
+ /* Empty CPU range strings will be considered valid, they will simply
+ * not set any bit in the CPU bitmap.
+ */
+ if (!*cpus) {
+ return;
+ }
+
+ if (parse_uint(cpus, &value, &endptr) < 0) {
+ goto error;
+ }
if (*endptr == '-') {
- endvalue = strtoull(endptr+1, &endptr, 10);
- } else {
+ if (parse_uint_full(endptr + 1, &endvalue) < 0) {
+ goto error;
+ }
+ } else if (*endptr == '\0') {
endvalue = value;
+ } else {
+ goto error;
}
- if (!(endvalue < MAX_CPUMASK_BITS)) {
+ if (endvalue >= MAX_CPUMASK_BITS) {
endvalue = MAX_CPUMASK_BITS - 1;
fprintf(stderr,
- "A max of %d CPUs are supported in a guest\n",
+ "qemu: NUMA: A max of %d VCPUs are supported\n",
MAX_CPUMASK_BITS);
}
+ if (endvalue < value) {
+ goto error;
+ }
+
bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
+ return;
+
+error:
+ fprintf(stderr, "qemu: Invalid NUMA CPU range: %s\n", cpus);
+ exit(1);
}
static void numa_add(const char *optarg)
--
1.7.11.7
[Qemu-devel] [PATCH 2/8] vl.c: Fix off-by-one bug when handling "-numa node" argument, Eduardo Habkost, 2013/01/16
[Qemu-devel] [PATCH 3/8] vl.c: Abort on unknown -numa option type, Eduardo Habkost, 2013/01/16
[Qemu-devel] [PATCH 8/8] vl.c: validate -numa "cpus" parameter properly,
Eduardo Habkost <=
[Qemu-devel] [PATCH 1/8] cutils: unsigned int parsing functions, Eduardo Habkost, 2013/01/16
[Qemu-devel] [PATCH 5/8] vl.c: numa_add(): Validate nodeid before using it, Eduardo Habkost, 2013/01/16
[Qemu-devel] [PATCH 4/8] vl.c: Check for NUMA node limit inside numa_add(), Eduardo Habkost, 2013/01/16