qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: libvir-list@redhat.com, Chegu Vinod <chegu_vinod@hp.com>,
	Anthony Liguori <anthony@codemonkey.ws>
Subject: [Qemu-devel] [PATCH 01/10] vl.c: Fix off-by-one bug when handling "-numa node" argument
Date: Fri, 11 Jan 2013 16:14:59 -0200	[thread overview]
Message-ID: <1357928108-21066-2-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1357928108-21066-1-git-send-email-ehabkost@redhat.com>

The numa_add() code was unconditionally adding 1 to the get_opt_name()
return value, making it point after the end of the string if no ','
separator is present.

Example of weird behavior caused by the bug:

  $ qemu-img create -f qcow2 this-file-image-has,cpus=5,mem=1000,in-its-name.qcow2 5G
  Formatting 'this-file-image-has,cpus=5,mem=1000,in-its-name.qcow2', fmt=qcow2 size=5368709120 encryption=off cluster_size=65536
  $ ./x86_64-softmmu/qemu-system-x86_64 -S -monitor stdio -numa node 'this-file-image-has,cpus=5,mem=1000,in-its-name.qcow2'
  QEMU 1.3.50 monitor - type 'help' for more information
  (qemu) info numa
  1 nodes
  node 0 cpus: 0
  node 0 size: 1000 MB
  (qemu)

This changes the code to nove the pointer only if ',' is found.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 vl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vl.c b/vl.c
index e5da31c..93fde36 100644
--- a/vl.c
+++ b/vl.c
@@ -1061,7 +1061,10 @@ static void numa_add(const char *optarg)
 
     value = endvalue = 0ULL;
 
-    optarg = get_opt_name(option, 128, optarg, ',') + 1;
+    optarg = get_opt_name(option, 128, optarg, ',');
+    if (*optarg == ',') {
+        optarg++;
+    }
     if (!strcmp(option, "node")) {
         if (get_param_value(option, 128, "nodeid", optarg) == 0) {
             nodenr = nb_numa_nodes;
-- 
1.7.11.7

  reply	other threads:[~2013-01-11 18:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-11 18:14 [Qemu-devel] [PATCH 00/10] -numa option parsing fixes & improvements Eduardo Habkost
2013-01-11 18:14 ` Eduardo Habkost [this message]
2013-01-11 18:15 ` [Qemu-devel] [PATCH 02/10] vl.c: Abort on unknown -numa option type Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [PATCH 03/10] vl.c: Isolate code specific to "-numa node" " Eduardo Habkost
2013-01-11 21:06   ` [Qemu-devel] [libvirt] " Eric Blake
2013-01-11 21:19     ` Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [PATCH 04/10] vl.c: Check for NUMA node limit inside numa_node_add() Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [PATCH 05/10] vl.c: Extract -numa "cpus" parsing to separate function Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [PATCH 06/10] vl.c: handle invalid NUMA CPU ranges properly Eduardo Habkost
2013-01-11 21:32   ` [Qemu-devel] [libvirt] " Eric Blake
2013-01-14 13:30     ` Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [PATCH 07/10] vl.c: numa_add_node(): Validate nodeid before using it Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [PATCH 08/10] vl.c: Support multiple CPU ranges on -numa option Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [RFC 09/10] vl.c: Introduce QemuOpts-friendly "-numa-node" config option Eduardo Habkost
2013-01-11 18:15 ` [Qemu-devel] [RFC 10/10] vl.c: Handle legacy "-numa node, cpus=A, B, C, D" format 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=1357928108-21066-2-git-send-email-ehabkost@redhat.com \
    --to=ehabkost@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=chegu_vinod@hp.com \
    --cc=libvir-list@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).