From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 22 Nov 2011 08:46:02 +0000 (+0100)
Subject: vl: Tighten parsing of -numa's parameter mem
X-Git-Tag: qemu-xen-4.3.0-rc1~1953
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c03417b438624988f1a027ce7829696ac98c3165;p=qemu-upstream-4.3-testing.git

vl: Tighten parsing of -numa's parameter mem

strtosz_suffix() fails unless the size is followed by 0, whitespace or
','.  Useless here, because we need to fail for any junk following the
size, even if it starts with whitespace or ','.  Check manually.

Things like

    -smp 4 -numa "node,mem=1024,cpus=0-1" -numa "node,mem=1024 cpus=2-3"

are now caught.  Before, the second -numa's argument was silently
interpreted as just "node,mem=1024".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index f5afed4c4..b9146cfde 100644
--- a/vl.c
+++ b/vl.c
@@ -953,8 +953,8 @@ static void numa_add(const char *optarg)
             node_mem[nodenr] = 0;
         } else {
             int64_t sval;
-            sval = strtosz(option, NULL);
-            if (sval < 0) {
+            sval = strtosz(option, &endptr);
+            if (sval < 0 || *endptr) {
                 fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg);
                 exit(1);
             }