From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Hu Tao <hutao@cn.fujitsu.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH v3 1/4] numa: Fix off-by-one error at MAX_CPUMASK_BITS check
Date: Thu, 12 Feb 2015 15:50:32 -0200 [thread overview]
Message-ID: <1423763435-3696-2-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1423763435-3696-1-git-send-email-ehabkost@redhat.com>
Fix the CPU index check to ensure we don't go beyond the size of the
node_cpu bitmap.
CPU index is always less than MAX_CPUMASK_BITS, as documented at
sysemu.h:
> The following shall be true for all CPUs:
> cpu->cpu_index < max_cpus <= MAX_CPUMASK_BITS
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
numa.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/numa.c b/numa.c
index 0d15375..41e496b 100644
--- a/numa.c
+++ b/numa.c
@@ -76,9 +76,9 @@ static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp)
}
for (cpus = node->cpus; cpus; cpus = cpus->next) {
- if (cpus->value > MAX_CPUMASK_BITS) {
+ if (cpus->value >= MAX_CPUMASK_BITS) {
error_setg(errp, "CPU number %" PRIu16 " is bigger than %d",
- cpus->value, MAX_CPUMASK_BITS);
+ cpus->value, MAX_CPUMASK_BITS - 1);
return;
}
bitmap_set(numa_info[nodenr].node_cpu, cpus->value, 1);
--
2.1.0
next prev parent reply other threads:[~2015-02-12 17:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-12 17:50 [Qemu-devel] [PATCH v3 0/4] NUMA: Validate CPU configuration Eduardo Habkost
2015-02-12 17:50 ` Eduardo Habkost [this message]
2015-02-24 6:38 ` [Qemu-devel] [PATCH v3 1/4] numa: Fix off-by-one error at MAX_CPUMASK_BITS check Igor Mammedov
2015-02-12 17:50 ` [Qemu-devel] [PATCH v3 2/4] numa: Reject CPU indexes > max_cpus Eduardo Habkost
2015-02-24 6:49 ` Igor Mammedov
2015-02-12 17:50 ` [Qemu-devel] [PATCH v3 3/4] numa: Reject configuration if CPU appears on multiple nodes Eduardo Habkost
2015-02-24 7:04 ` Igor Mammedov
2015-02-12 17:50 ` [Qemu-devel] [PATCH v3 4/4] numa: Print warning if no node is assigned to a CPU Eduardo Habkost
2015-02-12 18:22 ` Paolo Bonzini
2015-02-12 23:05 ` Eduardo Habkost
2015-02-24 8:01 ` Igor Mammedov
2015-02-24 18:19 ` Eduardo Habkost
2015-02-25 8:43 ` Igor Mammedov
2015-02-23 20:10 ` [Qemu-devel] [PATCH v3 0/4] NUMA: Validate CPU configuration Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423763435-3696-2-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=hutao@cn.fujitsu.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).