diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-06-26 18:33:19 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-29 18:59:42 +0300 |
| commit | 1945b9d8b03aad59e86bfe3a3194e6bbeffbad6a (patch) | |
| tree | ffadce6c79151ed73ec25c4e3a0714f6230f1916 | |
| parent | 1af878e0497a885b6cbdd3a6d91d399f4851d99c (diff) | |
| download | focaccia-qemu-1945b9d8b03aad59e86bfe3a3194e6bbeffbad6a.tar.gz focaccia-qemu-1945b9d8b03aad59e86bfe3a3194e6bbeffbad6a.zip | |
numa: Reject duplicate node IDs
The same nodeid shouldn't appear multiple times in the command-line. In addition to detecting command-line mistakes, this will fix a bug where nb_numa_nodes may become larger than MAX_NODES (and cause out-of-bounds access on the numa_info array). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Hu Tao <hutao@cn.fujitsu.com> Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | numa.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/numa.c b/numa.c index db10f954dd..c254127504 100644 --- a/numa.c +++ b/numa.c @@ -62,6 +62,11 @@ static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp) return; } + if (numa_info[nodenr].present) { + error_setg(errp, "Duplicate NUMA nodeid: %" PRIu16, nodenr); + return; + } + for (cpus = node->cpus; cpus; cpus = cpus->next) { if (cpus->value > MAX_CPUMASK_BITS) { error_setg(errp, "CPU number %" PRIu16 " is bigger than %d", |