qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Markus Armbruster <armbru@redhat.com>,
	Rohit Kumar <rohit.kumar3@nutanix.com>
Subject: [PULL 7/7] Check and report for incomplete 'global' option format
Date: Mon,  7 Mar 2022 19:26:09 +0100	[thread overview]
Message-ID: <20220307182609.94466-8-thuth@redhat.com> (raw)
In-Reply-To: <20220307182609.94466-1-thuth@redhat.com>

From: Rohit Kumar <rohit.kumar3@nutanix.com>

Qemu might crash when provided incomplete '-global' option.
For example:
     qemu-system-x86_64 -global driver=isa-fdc
     qemu-system-x86_64: ../../devel/qemu/qapi/string-input-visitor.c:394:
     string_input_visitor_new: Assertion `str' failed.
     Aborted (core dumped)

Fixes: 3751d7c43f795b ("vl: allow full-blown QemuOpts syntax for -global")
Signed-off-by: Rohit Kumar <rohit.kumar3@nutanix.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/604
Message-Id: <20220216071508.412974-1-rohit.kumar3@nutanix.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 softmmu/qdev-monitor.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index fe6cf268ff..12fe60c467 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -1038,6 +1038,13 @@ int qemu_global_option(const char *str)
     if (!opts) {
         return -1;
     }
+    if (!qemu_opt_get(opts, "driver")
+        || !qemu_opt_get(opts, "property")
+        || !qemu_opt_get(opts, "value")) {
+        error_report("options 'driver', 'property', and 'value'"
+                     " are required");
+        return -1;
+    }
 
     return 0;
 }
-- 
2.27.0



  parent reply	other threads:[~2022-03-07 18:37 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-07 18:26 [PULL 0/7] s390x, tests and misc patches Thomas Huth
2022-03-07 18:26 ` [PULL 1/7] tests/tcg/s390x: Fix mvc, mvo and pack tests with Clang Thomas Huth
2022-03-07 18:26 ` [PULL 2/7] tests/tcg/s390x: Fix the exrl-trt* " Thomas Huth
2022-03-07 18:26 ` [PULL 3/7] tests/tcg/s390x: Cleanup of mie3 tests Thomas Huth
2022-03-07 18:26 ` [PULL 4/7] MAINTAINERS: Update the files in the FreeBSD section Thomas Huth
2022-03-07 18:26 ` [PULL 5/7] tests/avocado: Cancel BootLinux tests in case there is no free port Thomas Huth
2022-03-07 18:26 ` [PULL 6/7] tests/vm: Update haiku test vm to R1/Beta3 Thomas Huth
2022-03-07 18:26 ` Thomas Huth [this message]
2022-03-08 19:30 ` [PULL 0/7] s390x, tests and misc patches Peter Maydell

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=20220307182609.94466-8-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=armbru@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rohit.kumar3@nutanix.com \
    /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).