[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/37] numa: Reject duplicate node IDs
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 11/37] numa: Reject duplicate node IDs |
Date: |
Sun, 29 Jun 2014 19:58:40 +0300 |
From: Eduardo Habkost <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Hu Tao <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
numa.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/numa.c b/numa.c
index db10f95..c254127 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",
--
MST
- [Qemu-devel] [PULL 00/37] pc,vhost,virtio fixes, enhancements, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 01/37] numa: fix comment, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 03/37] numa: fix comment, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 02/37] openrisc: fix comment, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 04/37] pc: Move q35 compat props to PC_COMPAT_*, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 06/37] mc146818rtc: add rtc-reset-reinjection QMP command, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 08/37] pc: make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 05/37] pc: Fix "prog_if" typo on PC_COMPAT_2_0, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 07/37] vhost-user: fix wrong ids in documentation, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 09/37] Allow mismatched virtio config-len, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 11/37] numa: Reject duplicate node IDs,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/37] numa: Keep track of NUMA nodes present on the command-line, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 12/37] numa: Reject configuration if not all node IDs are present, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 13/37] vhost-user: fix regions provied with VHOST_USER_SET_MEM_TABLE message, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 14/37] vhost-user: typo fixups, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 15/37] virtio-net: byteswap virtio-net header, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 17/37] virtio: introduce device specific migration calls, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 16/37] virtio-serial: don't migrate the config space, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 18/37] virtio-net: implement per-device migration calls, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 19/37] virtio-blk: implement per-device migration calls, Michael S. Tsirkin, 2014/06/29
- [Qemu-devel] [PULL 20/37] virtio-serial: implement per-device migration calls, Michael S. Tsirkin, 2014/06/29