Patchwork [5/8] vl.c: numa_add(): Validate nodeid before using it

login
register
mail settings
Submitter Eduardo Habkost
Date Jan. 16, 2013, 3:24 p.m.
Message ID <1358349851-20960-6-git-send-email-ehabkost@redhat.com>
Download mbox | patch
Permalink /patch/213012/
State New
Headers show

Comments

Eduardo Habkost - Jan. 16, 2013, 3:24 p.m.
Without this check, QEMU will corrupt memory if a too-large nodeid is
provided in the command-line. e.g.:

  -numa node,mem=...,cpus=...,nodeid=65

This changes nodenr to unsigned long long, to avoid integer conversion
issues when converting the strtoull() result to int.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes v2:
 - Implement change without creation of numa_node_add() function
---
 vl.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/vl.c b/vl.c
index dabbba1..3637a39 100644
--- a/vl.c
+++ b/vl.c
@@ -1246,7 +1246,7 @@  static void numa_add(const char *optarg)
     char option[128];
     char *endptr;
     unsigned long long value, endvalue;
-    int nodenr;
+    unsigned long long nodenr;
 
     value = endvalue = 0ULL;
 
@@ -1267,6 +1267,11 @@  static void numa_add(const char *optarg)
             nodenr = strtoull(option, NULL, 10);
         }
 
+        if (nodenr >= MAX_NODES) {
+            fprintf(stderr, "qemu: invalid NUMA nodeid: %d\n", nodenr);
+            exit(1);
+        }
+
         if (get_param_value(option, 128, "mem", optarg) == 0) {
             node_mem[nodenr] = 0;
         } else {